svn commit: r510287 - in head/shells/ksh93: . files
Cy Schubert
cy at FreeBSD.org
Fri Aug 30 20:05:28 UTC 2019
Author: cy
Date: Fri Aug 30 20:05:27 2019
New Revision: 510287
URL: https://svnweb.freebsd.org/changeset/ports/510287
Log:
Update 2020.0.0-alpha1 --> 2020.0.0-beta1
2020.0.0-beta1 resolves gcc9 build issues in PR/239644.
PR: 239644
Added:
head/shells/ksh93/files/patch-scripts_builtin_documentation.sh (contents, props changed)
Deleted:
head/shells/ksh93/files/patch-scripts__libast____prereq.sh
head/shells/ksh93/files/patch-scripts__sort____symbols.py
head/shells/ksh93/files/patch-src__lib__libast__comp__conf.sh
head/shells/ksh93/files/patch-src__lib__libast__comp__conf.tab
head/shells/ksh93/files/patch-src__lib__libast__comp__conftab.c
head/shells/ksh93/files/patch-src__lib__libast__comp__conftab.c.in
head/shells/ksh93/files/patch-src__lib__libast__comp__conftab.h.in
head/shells/ksh93/files/patch-src__lib__libast__include__conftab.h
head/shells/ksh93/files/patch-src__lib__libast__meson.build
head/shells/ksh93/files/patch-src_cmd_ksh93_sh_xec.c
Modified:
head/shells/ksh93/Makefile (contents, props changed)
head/shells/ksh93/distinfo (contents, props changed)
head/shells/ksh93/files/extra-patch-install-as-ksh93 (contents, props changed)
Modified: head/shells/ksh93/Makefile
==============================================================================
--- head/shells/ksh93/Makefile Fri Aug 30 20:05:21 2019 (r510286)
+++ head/shells/ksh93/Makefile Fri Aug 30 20:05:27 2019 (r510287)
@@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= ksh93
-DISTVERSION= 2020.0.0-alpha1
+DISTVERSION= 2020.0.0-beta1
PORTEPOCH= 1
-PORTREVISION= 3
CATEGORIES= shells
MAINTAINER= cy at freebsd.org
@@ -43,7 +42,7 @@ 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/ksh.1 ${WRKSRC}/src/cmd/ksh93/ksh93.1
+ @${MV} ${WRKSRC}/src/cmd/ksh93/docs/ksh.1 ${WRKSRC}/src/cmd/ksh93/docs/ksh93.1
.endif
.if ${PORT_OPTIONS:MKSH}
@# Keep portlint happy
Modified: head/shells/ksh93/distinfo
==============================================================================
--- head/shells/ksh93/distinfo Fri Aug 30 20:05:21 2019 (r510286)
+++ head/shells/ksh93/distinfo Fri Aug 30 20:05:27 2019 (r510287)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556307803
-SHA256 (att-ast-2020.0.0-alpha1_GH0.tar.gz) = a9c6a9291ee1a2a5169cdebfe601124e53ae15f83d0857c166d9f2d86c1d4294
-SIZE (att-ast-2020.0.0-alpha1_GH0.tar.gz) = 2041318
+TIMESTAMP = 1567192601
+SHA256 (att-ast-2020.0.0-beta1_GH0.tar.gz) = bc63b59be0087299f9e933d7f32806995e3e3ba57b887ca0d2517275972711e2
+SIZE (att-ast-2020.0.0-beta1_GH0.tar.gz) = 2022260
Modified: head/shells/ksh93/files/extra-patch-install-as-ksh93
==============================================================================
--- head/shells/ksh93/files/extra-patch-install-as-ksh93 Fri Aug 30 20:05:21 2019 (r510286)
+++ head/shells/ksh93/files/extra-patch-install-as-ksh93 Fri Aug 30 20:05:27 2019 (r510287)
@@ -1,8 +1,8 @@
---- src/cmd/ksh93/meson.build.orig 2018-09-25 15:33:55.000000000 -0700
-+++ src/cmd/ksh93/meson.build 2018-09-25 19:00:44.313649000 -0700
+--- ./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 @@
- dependencies: [libm_dep, libexecinfo_dep, libdl_dep],
- install: false)
+ 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,
@@ -15,11 +15,11 @@
+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],
+ dependencies: [libm_dep, libexecinfo_dep, libdl_dep, libsocket_dep, libnsl_dep],
install: true)
--install_man('ksh.1')
-+install_man('ksh93.1')
+-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')
Added: head/shells/ksh93/files/patch-scripts_builtin_documentation.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/shells/ksh93/files/patch-scripts_builtin_documentation.sh Fri Aug 30 20:05:27 2019 (r510287)
@@ -0,0 +1,10 @@
+--- 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
More information about the svn-ports-all
mailing list