diff --git a/shells/ksh/Makefile b/shells/ksh/Makefile index ba60f82e33f3..26617ec47ba0 100644 --- a/shells/ksh/Makefile +++ b/shells/ksh/Makefile @@ -1,75 +1,75 @@ # 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. DISTVERSIONPREFIX= v PORTNAME= ksh -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= shells MAINTAINER= cy@FreeBSD.org COMMENT= ksh93u+m is the renewed development of ksh93 based on AT&T ksh93u+m (stable) WWW= http://www.kornshell.com/ LICENSE= EPL USES= compiler:c11 USE_GITHUB= yes GH_ACCOUNT= ksh93 GH_PROJECT= ksh # 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 ksh-devel OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC OPTIONS_SINGLE= BIN_KSH OPTIONS_SINGLE_BIN_KSH= KSH KSH93 KSH93N KSH_DESC= Install to ${PREFIX}/bin/ksh KSH93_DESC= Install to ${PREFIX}/bin/ksh93 KSH93N_DESC= Install to ${PREFIX}/bin/ksh93n (new) 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" KSH93N_PLIST_SUB= 93="93n" .include .if ${PORT_OPTIONS:MKSH93N} PSUFFIX= 93n .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/distinfo b/shells/ksh/distinfo index d95ba35240aa..79ffc223ac8f 100644 --- a/shells/ksh/distinfo +++ b/shells/ksh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666457964 -SHA256 (ksh93-ksh-v1.0.4_GH0.tar.gz) = 7ab7785a277f96acd8b645dc70769adf0cc92546dac356639852bff1d708275f -SIZE (ksh93-ksh-v1.0.4_GH0.tar.gz) = 2127036 +TIMESTAMP = 1686152726 +SHA256 (ksh93-ksh-v1.0.5_GH0.tar.gz) = 940d6dd6b4204f4965cf87cbba5bdf2d2c5153975100ee242038425f9470c0fe +SIZE (ksh93-ksh-v1.0.5_GH0.tar.gz) = 2109689 diff --git a/shells/ksh/files/patch-src_lib_libast_aso_aso.c b/shells/ksh/files/patch-src_lib_libast_aso_aso.c deleted file mode 100644 index 891c022d470e..000000000000 --- a/shells/ksh/files/patch-src_lib_libast_aso_aso.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/libast/aso/aso.c.orig 2022-10-21 20:05:14.000000000 -0700 -+++ src/lib/libast/aso/aso.c 2023-02-15 06:39:08.156515000 -0800 -@@ -836,7 +836,7 @@ - - #if defined(_aso_casptr) - if (!state.lockf) -- return _aso_casptr((void**)p, o, n); -+ return _aso_cas64((void**)p, o, n); - #endif - k = lock(state.data, 0, p); - if (*(void* volatile*)p == o)