diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 90300f060f96..e991db8811d1 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -1,83 +1,82 @@ # Make sure that your configuration DOES NOT set ANY gcc-related # variables. ksh93 will not compile if you set even the seemingly # most unrelated variable related to gcc configuration. This means # especially any flag which attempts to set the cputype. Setting the # cputype does absolutely nothing except cause systems to fail in # horrible ways. For any modern processor, setting the cputype only # serves to expose gcc bugs and does nothing to speed up any known # program. If you are really unconvinced, go ahead but do not # complain to me about it. PORTNAME= ksh PORTVERSION= ${AST_COMMIT_DATE} -PORTREVISION= 1 CATEGORIES= shells PKGNAMESUFFIX= -devel MAINTAINER= cy@FreeBSD.org COMMENT= ksh93u+m is the development branch ksh93 based on AT&T ksh93u+ (stable) WWW= http://www.kornshell.com/ LICENSE= EPL BROKEN_FreeBSD_12= exit code 139 making lib/libcmd -HASH= c6ee0aa6 -AST_COMMIT_DATE= 2023.06.09 +HASH= 943089ec +AST_COMMIT_DATE= 2023.06.13 USES= compiler:c11 USE_GITHUB= yes GH_ACCOUNT= ksh93 GH_PROJECT= ksh GH_TAGNAME= ${HASH} # IMPORTANT: Disabling conflicts, i.e. -DDISABLE_CONFLICTS will result in # arcane build failures due to already installed ksh/ksh93 in # $PATH. KSH_CONFLICTS= pdksh KSH93_CONFLICTS= ksh93 ast-ksh KSH93D_CONFLICTS= ksh93 ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC OPTIONS_SINGLE= BIN_KSH OPTIONS_SINGLE_BIN_KSH= KSH KSH93 KSH93D KSH_DESC= Install to ${PREFIX}/bin/ksh KSH93_DESC= Install to ${PREFIX}/bin/ksh93 KSH93D_DESC= Install to ${PREFIX}/bin/ksh93d (development) CFLAGS+= -DMAP_TYPE LDFLAGS+= -lm MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses" CFLAGS="${CFLAGS}" STATIC_MAKE_ENV= LDFLAGS+=-static KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" KSH93D_PLIST_SUB= 93="93d" .include .if ${PORT_OPTIONS:MKSH93D} PSUFFIX= 93d .elif ${PORT_OPTIONS:MKSH93} PSUFFIX= 93 .endif post-patch: @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c do-build: @cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${STAGEDIR}${PREFIX}/bin/ksh${PSUFFIX} ${INSTALL_MAN} ${WRKSRC}/man/man1/sh.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ksh${PSUFFIX}.1 ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ cd ${WRKSRC}/fun/ && ${INSTALL_SCRIPT} dirs popd pushd ${STAGEDIR}${EXAMPLESDIR}${PSUFFIX}/ do-test: cd ${WRKSRC}/src/cmd/ksh93/tests/ && ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests .include diff --git a/shells/ksh-devel/distinfo b/shells/ksh-devel/distinfo index 28c1c081e574..6047c11f7899 100644 --- a/shells/ksh-devel/distinfo +++ b/shells/ksh-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686561387 -SHA256 (ksh93-ksh-2023.06.09-c6ee0aa6_GH0.tar.gz) = d609c245bc1dc1ecbedb49a2b4161c7e6cf35e67ad2c205ffd9c1a0759a41e7d -SIZE (ksh93-ksh-2023.06.09-c6ee0aa6_GH0.tar.gz) = 2107610 +TIMESTAMP = 1686682002 +SHA256 (ksh93-ksh-2023.06.13-943089ec_GH0.tar.gz) = 18dcc47bf0435af5d797066d2356be4728e8bd6f620284d06d1eaf6c62a7f97d +SIZE (ksh93-ksh-2023.06.13-943089ec_GH0.tar.gz) = 2109804 diff --git a/shells/ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c b/shells/ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c deleted file mode 100644 index a3b6a4f2585e..000000000000 --- a/shells/ksh-devel/files/patch-src_cmd_ksh93_sh_macro.c +++ /dev/null @@ -1,84 +0,0 @@ ---- src/cmd/ksh93/sh/macro.c.orig 2023-06-08 23:30:08.000000000 -0700 -+++ src/cmd/ksh93/sh/macro.c 2023-06-12 19:26:31.718942000 -0700 -@@ -76,6 +76,7 @@ - char macsub; /* set to 1 when running mac_substitute */ - int dotdot; /* set for .. in subscript */ - void *nvwalk; /* for name space walking */ -+ char bracketexpr; /* set when in [brackets] within a non-ERE glob pattern */ - } Mac_t; - - #undef ESCAPE -@@ -437,7 +438,6 @@ - char oldquote = mp->quote; /* save "double quoted" state */ - char ansi_c = 0; /* set when processing ANSI C escape codes */ - int32_t ere = 0; /* bitmask of pattern options indicating an extended regular expression */ -- char bracketexpr = 0; /* set when in [brackets] within a non-ERE glob pattern */ - Sfio_t *sp = mp->sp; - Stk_t *stkp = sh.stk; - char *resume = 0; -@@ -533,7 +533,7 @@ - if(mp->pattern) - { - /* preserve \ for escaping glob pattern bracket expression operators */ -- if(bracketexpr && n==S_BRAOP) -+ if(mp->bracketexpr && n==S_BRAOP) - break; - /* preserve \digit for pattern matching */ - /* also \alpha for extended patterns */ -@@ -636,8 +636,8 @@ - mp->pattern = c; - break; - case S_ENDCH: -- if(bracketexpr && cp[-1]==RBRACT && !(mp->quote || mp->lit)) -- bracketexpr--; -+ if(mp->bracketexpr && cp[-1]==RBRACT && !(mp->quote || mp->lit)) -+ mp->bracketexpr--; - if((mp->lit || cp[-1]!=endch || mp->quote!=newquote)) - goto pattern; - if(endch==RBRACE && mp->pattern && brace) -@@ -738,12 +738,12 @@ - cp = first = fcseek(0); - break; - } -- if(mp->pattern==1 && !ere && !bracketexpr) -+ if(mp->pattern==1 && !ere && !mp->bracketexpr) - { -- bracketexpr++; -+ mp->bracketexpr++; - /* a ] following [, as in []abc], should not close the bracket expression */ - if(cp[0]==RBRACT && cp[1]) -- bracketexpr++; -+ mp->bracketexpr++; - } - /* FALLTHROUGH */ - case S_PAT: -@@ -883,7 +883,7 @@ - break; - case S_BRAOP: - /* escape a quoted !^- within a bracket expression */ -- if(!bracketexpr || !(mp->quote || mp->lit)) -+ if(!mp->bracketexpr || !(mp->quote || mp->lit)) - continue; - if(c) - sfwrite(stkp,first,c); -@@ -2481,7 +2481,10 @@ - continue; - } - if(n==S_ESC) -- sfputc(stkp,ESCAPE); -+ { -+ if(!mp->bracketexpr) -+ sfputc(stkp,ESCAPE); -+ } - else if(n==S_EPAT) - { - /* don't allow extended patterns in this case */ -@@ -2583,7 +2586,7 @@ - mp->atmode = 0; - if(mp->patfound) - { -- int musttrim = mp->wasexpan && !mp->noextpat && strchr(argp->argval,'\\'); -+ int musttrim = mp->wasexpan && !mp->quoted && !mp->noextpat && strchr(argp->argval,'\\'); - sh.argaddr = 0; - #if SHOPT_BRACEPAT - /* in POSIX mode, disallow brace expansion for unquoted expansions */