Index: head/shells/ksh93-devel/Makefile =================================================================== --- head/shells/ksh93-devel/Makefile (revision 512235) +++ head/shells/ksh93-devel/Makefile (revision 512236) @@ -1,51 +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= 657c587 -AST_COMMIT_DATE= 2019.09.03 +HASH= 1c9e7ab8 +AST_COMMIT_DATE= 2019.09.17 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 +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 512235) +++ head/shells/ksh93-devel/distinfo (revision 512236) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567565030 -SHA256 (att-ast-2019.09.03-657c587_GH0.tar.gz) = 62494fb5d9dfa3d201091a7df19654806110db8b969546b9d64ec271be27baba -SIZE (att-ast-2019.09.03-657c587_GH0.tar.gz) = 2023290 +TIMESTAMP = 1568746353 +SHA256 (att-ast-2019.09.17-1c9e7ab8_GH0.tar.gz) = c313b4c967690b0c6b3e86c30a25ee60ae5a75c5993f2bcd3f230aa81ce95a7a +SIZE (att-ast-2019.09.17-1c9e7ab8_GH0.tar.gz) = 2112496 Index: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 =================================================================== --- head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (revision 512235) +++ head/shells/ksh93-devel/files/extra-patch-install-as-ksh93 (revision 512236) @@ -1,25 +1,18 @@ ---- ./src/cmd/ksh93/meson.build.orig 2019-08-25 15:52:12.000000000 -0700 -+++ ./src/cmd/ksh93/meson.build 2019-08-28 12:34:47.804820000 -0700 -@@ -26,19 +26,19 @@ +--- ./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 @@ 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) -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], - install: true) - --install_man('docs/ksh.1') -+install_man('docs/ksh93.1') - - test_dir = join_paths(meson.current_source_dir(), 'tests') - test_driver = join_paths(test_dir, 'util', 'run_test.sh') Index: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93-doc =================================================================== --- head/shells/ksh93-devel/files/extra-patch-install-as-ksh93-doc (nonexistent) +++ head/shells/ksh93-devel/files/extra-patch-install-as-ksh93-doc (revision 512236) @@ -0,0 +1,10 @@ +--- 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. Property changes on: head/shells/ksh93-devel/files/extra-patch-install-as-ksh93-doc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/shells/ksh93-devel/pkg-plist =================================================================== --- head/shells/ksh93-devel/pkg-plist (revision 512235) +++ head/shells/ksh93-devel/pkg-plist (revision 512236) @@ -1,3 +1,33 @@ @shell bin/ksh%%93%% bin/shcomp%%93%% man/man1/ksh%%93%%.1.gz +share/ksh/config.ksh +share/ksh/functions/_ksh_print_help +share/ksh/functions/dirs +share/ksh/functions/man +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/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/source.1