Index: head/shells/ksh93-devel/Makefile =================================================================== --- head/shells/ksh93-devel/Makefile (revision 524670) +++ head/shells/ksh93-devel/Makefile (revision 524671) @@ -1,52 +1,52 @@ # $FreeBSD$ PORTNAME= ksh93 PORTVERSION= ${AST_COMMIT_DATE} CATEGORIES= shells PKGNAMESUFFIX= -devel MAINTAINER= cy@FreeBSD.org COMMENT= Development branch of AT&T KornShell 93 LICENSE= EPL USES= compiler:c11 meson ninja python:build -HASH= 031d73aa -AST_COMMIT_DATE= 2020.01.11 +HASH= db54d369 +AST_COMMIT_DATE= 2020.01.30 USE_GITHUB= yes GH_ACCOUNT= att GH_PROJECT= ast GH_TAGNAME= ${HASH} KSH_CONFLICTS= pdksh-* KSH93_CONFLICTS= ksh93-2* ast-ksh-* MESON_BUILD_DIR= build OPTIONS_DEFAULT= KSH93 OPTIONS_SINGLE= BIN_KSH OPTIONS_SINGLE_BIN_KSH= KSH KSH93 KSH_DESC= Install to ${PREFIX}/bin/ksh KSH93_DESC= Install to ${PREFIX}/bin/ksh93 KSH93_EXTRA_PATCHES= ${FILESDIR}/extra-patch-install-as-ksh93 \ ${FILESDIR}/extra-patch-install-as-ksh93-doc KSH_PLIST_SUB= 93="" KSH93_PLIST_SUB= 93="93" .include post-patch: @${REINPLACE_CMD} -e '/for name in/ s|python.*|${PYTHON_CMD}|g' ${WRKSRC}/scripts/python.sh @${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c .if ${PORT_OPTIONS:MKSH93} @${MV} ${WRKSRC}/src/cmd/ksh93/docs/ksh.1 ${WRKSRC}/src/cmd/ksh93/docs/ksh93.1 .endif .if ${PORT_OPTIONS:MKSH} @# Keep portlint happy .endif .include Index: head/shells/ksh93-devel/distinfo =================================================================== --- head/shells/ksh93-devel/distinfo (revision 524670) +++ head/shells/ksh93-devel/distinfo (revision 524671) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578763618 -SHA256 (att-ast-2020.01.11-031d73aa_GH0.tar.gz) = 6addb573a6e2059cad4de53ab75ac09694776f7e9ac98f28c24c43e9f19a2c48 -SIZE (att-ast-2020.01.11-031d73aa_GH0.tar.gz) = 2228653 +TIMESTAMP = 1580443934 +SHA256 (att-ast-2020.01.30-db54d369_GH0.tar.gz) = 322deb2c6e63726751de7d0f0e1bae8de4047849b1956432a33555de11f5a750 +SIZE (att-ast-2020.01.30-db54d369_GH0.tar.gz) = 2229756 Index: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 =================================================================== --- head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (revision 524670) +++ head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (revision 524671) @@ -1,18 +1,25 @@ ---- ./src/cmd/ksh93/meson.build.orig 2019-09-16 17:08:04.000000000 -0700 -+++ ./src/cmd/ksh93/meson.build 2019-09-17 11:55:21.799030000 -0700 -@@ -27,13 +27,13 @@ +--- src/cmd/ksh93/meson.build.orig 2020-01-30 18:34:35.000000000 -0800 ++++ src/cmd/ksh93/meson.build 2020-01-30 20:47:13.410465000 -0800 +@@ -26,7 +26,7 @@ dependencies: [libm_dep, libexecinfo_dep, libdl_dep, libsocket_dep, libnsl_dep], install: get_option('default_library') == 'shared') -ksh93_exe = executable('ksh', ['sh/pmain.c'], c_args: shared_c_args, +ksh93_exe = executable('ksh93', ['sh/pmain.c'], c_args: shared_c_args, include_directories: [configuration_incdir, ksh93_incdir], link_with: [libksh, libast, libcmd, libdll], dependencies: [libm_dep, libexecinfo_dep, libdl_dep], - install: true) +@@ -34,11 +34,11 @@ + + # Create a symlink for a restricted version of the ksh shell. + create_rksh_symlink = find_program(source_dir + '/scripts/create_rksh_symlink') +-rksh93_exe = custom_target('rksh', input: ksh93_exe, output: 'rksh', build_by_default: true, ++rksh93_exe = custom_target('rksh', input: ksh93_exe, output: 'rksh93', build_by_default: true, + install: true, install_mode: 'rwxr-xr-x', install_dir: install_prefix + '/bin', + command: [create_rksh_symlink, '@INPUT@']) -shcomp_exe = executable('shcomp', ['sh/shcomp.c'], c_args: shared_c_args, +shcomp_exe = executable('shcomp93', ['sh/shcomp.c'], c_args: shared_c_args, include_directories: [configuration_incdir, ksh93_incdir], link_with: [libksh, libast, libcmd, libdll], dependencies: [libm_dep, libexecinfo_dep, libdl_dep, libsocket_dep, libnsl_dep], Index: head/shells/ksh93-devel/pkg-plist =================================================================== --- head/shells/ksh93-devel/pkg-plist (revision 524670) +++ head/shells/ksh93-devel/pkg-plist (revision 524671) @@ -1,63 +1,64 @@ @shell bin/ksh%%93%% +@shell bin/rksh%%93%% bin/shcomp%%93%% man/man1/ksh%%93%%.1.gz share/ksh/config.ksh -share/ksh/functions/_cd +share/ksh/functions/cd share/ksh/functions/_ksh_print_help share/ksh/functions/dirs share/ksh/functions/man share/ksh/functions/mcd share/ksh/functions/popd share/ksh/functions/pushd share/ksh/man/man1/alias.1 share/ksh/man/man1/basename.1 share/ksh/man/man1/bg.1 share/ksh/man/man1/break.1 share/ksh/man/man1/builtin.1 share/ksh/man/man1/cat.1 share/ksh/man/man1/cd.1 share/ksh/man/man1/chmod.1 share/ksh/man/man1/cmp.1 share/ksh/man/man1/command.1 share/ksh/man/man1/compgen.1 share/ksh/man/man1/complete.1 share/ksh/man/man1/continue.1 share/ksh/man/man1/cut.1 share/ksh/man/man1/dirname.1 share/ksh/man/man1/disown.1 share/ksh/man/man1/echo.1 share/ksh/man/man1/enum.1 share/ksh/man/man1/eval.1 share/ksh/man/man1/exec.1 share/ksh/man/man1/exit.1 share/ksh/man/man1/export.1 share/ksh/man/man1/fg.1 share/ksh/man/man1/head.1 share/ksh/man/man1/hist.1 share/ksh/man/man1/jobs.1 share/ksh/man/man1/kill.1 share/ksh/man/man1/let.1 share/ksh/man/man1/logname.1 share/ksh/man/man1/mkdir.1 share/ksh/man/man1/print.1 share/ksh/man/man1/printf.1 share/ksh/man/man1/pwd.1 share/ksh/man/man1/read.1 share/ksh/man/man1/readonly.1 share/ksh/man/man1/return.1 share/ksh/man/man1/shcomp.1 share/ksh/man/man1/shift.1 share/ksh/man/man1/sleep.1 share/ksh/man/man1/source.1 share/ksh/man/man1/sync.1 share/ksh/man/man1/test.1 share/ksh/man/man1/times.1 share/ksh/man/man1/trap.1 share/ksh/man/man1/ulimit.1 share/ksh/man/man1/umask.1 share/ksh/man/man1/unalias.1 share/ksh/man/man1/uname.1 share/ksh/man/man1/unset.1 share/ksh/man/man1/wait.1 share/ksh/man/man1/wc.1 share/ksh/man/man1/whence.1