* [PR PATCH] ksh: update to 1.0.0.beta.1.
@ 2021-05-17 16:11 leahneukirchen
2021-12-17 16:21 ` leahneukirchen
2021-12-17 16:21 ` [PR PATCH] [Closed]: " leahneukirchen
0 siblings, 2 replies; 3+ messages in thread
From: leahneukirchen @ 2021-05-17 16:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages kshum
https://github.com/void-linux/void-packages/pull/30951
ksh: update to 1.0.0.beta.1.
Queuing for now until a stable release appears.
Revert to the maintained fork "ksh93u+m".
A patch file from https://github.com/void-linux/void-packages/pull/30951.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kshum-30951.patch --]
[-- Type: text/x-diff, Size: 2420 bytes --]
From 4ebff0164dff0e3b1f5081dc98d5dc3751390b8c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 17 May 2021 18:09:50 +0200
Subject: [PATCH] ksh: update to 1.0.0.beta.1.
Revert to the maintained fork "ksh93u+m".
---
srcpkgs/ksh/template | 46 +++++++++++++++++++-------------------------
1 file changed, 20 insertions(+), 26 deletions(-)
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index 2709dacc0b02..24a5f9e24bd1 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,16 +1,15 @@
# Template file for 'ksh'
pkgname=ksh
-version=2020.0.0
+reverts="2020.0.0_1"
+version=1.0.0.beta.1
revision=1
-wrksrc="ast-${version}"
-build_style=meson
-configure_args="-Dbuild-api-tests=false -Dbuild-api-tests-only=true"
-short_desc="AT&T's Korn shell (ksh93)"
+wrksrc="ksh-${version/.beta/-beta}"
+short_desc="AT&T's Korn shell (ksh93u+m)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
homepage="http://www.kornshell.com/"
-distfiles="https://github.com/att/ast/archive/${version}.tar.gz"
-checksum=76597c96c4f94423b9225b5de50ea54be08d5bbaa1e0e594a7eec603bd60ecaf
+distfiles="https://github.com/ksh93/ksh/archive/v${version/.beta/-beta}.tar.gz"
+checksum=7d77b59a9352ffe3fc60a1af936e022c1f12cb42753d4a8a116d6c8126915738
nocross=yes
register_shell="/bin/ksh"
@@ -24,25 +23,20 @@ if [ "$build_option_static" ]; then
LDFLAGS+=" -static"
fi
-case "$XBPS_TARGET_MACHINE" in
-*-musl)
- makedepends+=" musl-fts-devel"
-esac
-
-post_extract() {
- sed -i -e 's/= library/= static_library/' \
- -e 's/install: true/install: false/' src/lib/*/meson.build
- sed -i 's/vpoi/void*/g' src/cmd/ksh93/include/name.h
- if [ "$build_option_static" ]; then
- # Drop tests that use .so
- sed -i '/some tests/,$d' src/cmd/ksh93/meson.build
- sed -i '/libsample_files/,$d' src/lib/libdll/meson.build
- fi
+do_build() {
+ bin/package make CCFLAGS="$CFLAGS" NPROC="$XBPS_MAKEJOBS"
+}
+do_check() {
+ # run inside own pty
+ script -qfc bin/shtests /dev/null
}
-post_install() {
- mv ${DESTDIR}/usr/bin/ksh ${DESTDIR}/usr/bin/ksh93
- mv ${DESTDIR}/usr/share/man/man1/ksh.1 ${DESTDIR}/usr/share/man/man1/ksh93.1
+do_install() {
+ vlicense LICENSE.md LICENSE
+
+ cd arch/*/
+ vbin bin/ksh ksh93
+ vbin bin/shcomp
vmkdir usr/share/ksh
- vcopy src/cmd/ksh93/fun usr/share/ksh/functions
- vlicense LICENSE
+ vcopy fun usr/share/ksh/functions
+ vman man/man1/sh.1 ksh93.1
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: ksh: update to 1.0.0.beta.1.
2021-05-17 16:11 [PR PATCH] ksh: update to 1.0.0.beta.1 leahneukirchen
@ 2021-12-17 16:21 ` leahneukirchen
2021-12-17 16:21 ` [PR PATCH] [Closed]: " leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2021-12-17 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by leahneukirchen on void-packages repository
https://github.com/void-linux/void-packages/pull/30951#issuecomment-996849685
Comment:
Merged in 265104d1035d
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Closed]: ksh: update to 1.0.0.beta.1.
2021-05-17 16:11 [PR PATCH] ksh: update to 1.0.0.beta.1 leahneukirchen
2021-12-17 16:21 ` leahneukirchen
@ 2021-12-17 16:21 ` leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2021-12-17 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
There's a closed pull request on the void-packages repository
ksh: update to 1.0.0.beta.1.
https://github.com/void-linux/void-packages/pull/30951
Description:
Queuing for now until a stable release appears.
Revert to the maintained fork "ksh93u+m".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-17 16:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-17 16:11 [PR PATCH] ksh: update to 1.0.0.beta.1 leahneukirchen
2021-12-17 16:21 ` leahneukirchen
2021-12-17 16:21 ` [PR PATCH] [Closed]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).