diff --git a/MOVED b/MOVED index b2625e2484926..08e9fdf389efe 100644 --- a/MOVED +++ b/MOVED @@ -17713,3 +17713,4 @@ devel/rubygem-aws-sdk-core3159|devel/rubygem-aws-sdk-core|2022-12-30|Remove obso devel/rubygem-aws-sdk-s31114|devel/rubygem-aws-sdk-s3|2022-12-30|Remove obsoleted port. Use devel/rubygem-aws-sdk-s3 instead devel/rubygem-google-protobuf319|devel/rubygem-google-protobuf|2022-12-30|Remove obsoleted port. Use devel/rubygem-google-protobuf instead databases/pgpool-II-37|databases/pgpool-II-43|2022-12-30|Has expired: Upstream EOL reaches on 2022-11 use pgpool-II-43 +shells/ksh2020||2022-12-30|Has expired: Upstream ksh2020 branch archived, development continues under new ksh93 project diff --git a/shells/Makefile b/shells/Makefile index 87699be710673..6ae90402bbd70 100644 --- a/shells/Makefile +++ b/shells/Makefile @@ -26,7 +26,6 @@ SUBDIR += klish SUBDIR += ksh SUBDIR += ksh-devel - SUBDIR += ksh2020 SUBDIR += ksh93 SUBDIR += mksh SUBDIR += modernish diff --git a/shells/ksh2020/Makefile b/shells/ksh2020/Makefile deleted file mode 100644 index e4859480b2a4c..0000000000000 --- a/shells/ksh2020/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -PORTNAME= ksh2020 -PORTVERSION= 2020 -PORTREVISION= 1 -CATEGORIES= shells - -MAINTAINER= cy@FreeBSD.org -COMMENT= Archived development branch of AT&T KornShell 93 -WWW= http://www.kornshell.com/ - -LICENSE= EPL - -DEPRECATED= Upstream ksh2020 branch archived, development continues under new ksh93 project -EXPIRATION_DATE= 2022-09-30 - -USES= compiler:c11 meson ninja python:build - -USE_GITHUB= yes -GH_ACCOUNT= att -GH_PROJECT= ast -GH_TAGNAME= ksh2020 - -KSH_CONFLICTS= pdksh -KSH93_CONFLICTS= ksh93 ksh93-devel 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} -.endif - -.include diff --git a/shells/ksh2020/distinfo b/shells/ksh2020/distinfo deleted file mode 100644 index 3574817c00a0a..0000000000000 --- a/shells/ksh2020/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1581224799 -SHA256 (att-ast-2020-ksh2020_GH0.tar.gz) = b90129a1c5234edfdd10326d41920bc9b5e4b274ab3022c6749a93be0ec898a7 -SIZE (att-ast-2020-ksh2020_GH0.tar.gz) = 2229912 diff --git a/shells/ksh2020/files/extra-patch-install-as-ksh93 b/shells/ksh2020/files/extra-patch-install-as-ksh93 deleted file mode 100644 index 0ef50874bd813..0000000000000 --- a/shells/ksh2020/files/extra-patch-install-as-ksh93 +++ /dev/null @@ -1,25 +0,0 @@ ---- 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], -@@ -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], diff --git a/shells/ksh2020/files/extra-patch-install-as-ksh93-doc b/shells/ksh2020/files/extra-patch-install-as-ksh93-doc deleted file mode 100644 index 35e8b7d6dd8e7..0000000000000 --- a/shells/ksh2020/files/extra-patch-install-as-ksh93-doc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/cmd/ksh93/docs/meson.build.orig 2019-09-16 17:08:04.000000000 -0700 -+++ src/cmd/ksh93/docs/meson.build 2019-09-17 12:15:14.321848000 -0700 -@@ -3,6 +3,6 @@ - # default man page directory: /usr/local/share/man/man1. The man pages for individual builtins will - # be installed in /usr/local/share/ksh/man. - # --install_man('ksh.1', install_mode: 'rw-r--r--') -+install_man('ksh93.1', install_mode: 'rw-r--r--') - - # See also scripts/install_aux_files.sh which takes care of installing the private man pages. diff --git a/shells/ksh2020/files/patch-scripts_builtin_documentation.sh b/shells/ksh2020/files/patch-scripts_builtin_documentation.sh deleted file mode 100644 index d89bb531bcad9..0000000000000 --- a/shells/ksh2020/files/patch-scripts_builtin_documentation.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- scripts/builtin_documentation.sh.orig 2019-08-30 05:32:36.000000000 -0700 -+++ scripts/builtin_documentation.sh 2019-08-30 12:40:24.125856000 -0700 -@@ -8,6 +8,6 @@ - cmd_name=$(basename "$in_file" .1) - [ "$cmd_name" = ksh ] && continue - echo "const char sh_opt${cmd_name}[] =" -- sed -e 's/\(.*\)/ "\1\\n"/' < "$in_file" -+ sed -e 's/"//g;s/\(.*\)/ "\1\\n"/' < "$in_file" - echo ";" - done diff --git a/shells/ksh2020/files/patch-src_cmd_ksh93_edit_pcomplete.c b/shells/ksh2020/files/patch-src_cmd_ksh93_edit_pcomplete.c deleted file mode 100644 index bd34d2bb7e4d2..0000000000000 --- a/shells/ksh2020/files/patch-src_cmd_ksh93_edit_pcomplete.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/cmd/ksh93/edit/pcomplete.c.orig 2020-11-20 14:41:10.427589000 +0000 -+++ src/cmd/ksh93/edit/pcomplete.c 2020-11-20 14:47:28.958973000 +0000 -@@ -338,8 +338,7 @@ - } - if (complete) { - // Reserved space on stack and try again. -- len = 3; -- tlen = (c + 1) * sizeof(char *) + len * c + 1024; -+ tlen += (c + 1) * sizeof(char *) + (plen + slen + 1) * c; - stkseek(shp->stk, tlen); - complete = 2; - av = (char **)stkptr(shp->stk, 0); diff --git a/shells/ksh2020/pkg-descr b/shells/ksh2020/pkg-descr deleted file mode 100644 index 9daad3daf5231..0000000000000 --- a/shells/ksh2020/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -KSH-93 is the most recent version of the KornShell Language described -in "The KornShell Command and Programming Language," by Morris -Bolsky and David Korn of AT&T Bell Laboratories. The KornShell is -a shell programming language, which is upward compatible with "sh" -(the Bourne Shell), and is intended to conform to the IEEE P1003.2/ISO -9945.2 Shell and Utilities standard. KSH-93 provides an enhanced -programming environment in addition to the major command-entry -features of the BSD shell "csh". With KSH-93, medium-sized programming -tasks can be performed at shell-level without a significant loss -in performance. In addition, "sh" scripts can be run on KSH-93 -without modification. diff --git a/shells/ksh2020/pkg-plist b/shells/ksh2020/pkg-plist deleted file mode 100644 index 0e4d7d5e0b2fd..0000000000000 --- a/shells/ksh2020/pkg-plist +++ /dev/null @@ -1,64 +0,0 @@ -@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/_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