From dba40d8339bc605ca3c5c0504693e6b3e3c2c479 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 31 Dec 2017 15:47:44 +0100 Subject: [PATCH] ksh: update to 2017.12.31. --- srcpkgs/ksh/template | 60 ++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 44 deletions(-) diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template index 7bcccb4b14d..6a1bd91b4b7 100644 --- a/srcpkgs/ksh/template +++ b/srcpkgs/ksh/template @@ -1,16 +1,17 @@ # Template file for 'ksh' pkgname=ksh -version=2012.08.01 -revision=6 -_debpkgver=93u+20120801 -wrksrc=${pkgname}-${_debpkgver} +version=2017.12.31 +revision=1 +_githash=efca325a73ddedf44848e91b11147bc97fd13638 +wrksrc="ast-${_githash}" +build_style=meson register_shell="/bin/ksh" short_desc="AT&T's Korn shell (ksh93)" -maintainer="Christian Neukirchen " -license="custom" +maintainer="Leah Neukirchen " +license="EPL-1.0" homepage="http://www.kornshell.com/" -distfiles="${DEBIAN_SITE}/main/k/ksh/ksh_${_debpkgver}.orig.tar.gz" -checksum=052d598df7ed3cbd0fdf458b796262b0b59f4cd3305d970be1cc2287408dbfc9 +distfiles="https://github.com/att/ast/archive/${_githash}.tar.gz" +checksum=47041e693b0a716fa08cb887463b4bae11db529890a82e437dc03326bf952b4d nocross=yes alternatives=" @@ -19,45 +20,16 @@ alternatives=" " build_options="static" +if [ "$build_option_static" ]; then + LDFLAGS+=" -static" +fi -case "$XBPS_TARGET_MACHINE" in -*-musl) -CFLAGS='-D_GNU_SOURCE' post_extract() { - # Don't rewrite xxx64 to xxx. - sed -i '/define.*off_t/d' src/lib/libast/include/ast_std.h - sed -i '/off_t/d' src/lib/libast/features/fs - sed -i '/define statvfs/d' src/lib/libast/features/fs - sed -i '/define.*64/d' src/cmd/ksh93/include/shell.h - sed -i '/ifdef RLIM64_INFINITY/,/endif/d' src/cmd/ksh93/features/rlimits - - # Don't let define FILE. - sed -i '/include.*_nxt_wchar/i#define __DEFINED_FILE' \ - src/lib/libast/features/wchar - sed -i '/define FILE/a#define __DEFINED_FILE' src/lib/libast/include/ast.h - - # Redefine iswalpha. - sed -i 's/#define iswalpha(w)\(.*\)/static __inline__ int isalphaw(wint_t w) { return \1; }/' src/lib/libast/features/wctype + sed -i -e 's/= library/= static_library/' \ + -e 's/install: true/install: false/' src/lib/*/meson.build } -esac - -do_build() { - if [ "$build_option_static" ]; then - LDFLAGS+=" -static" - fi - export SHELL=/bin/sh # bin/package breaks on bash - $SHELL bin/package make \ - CC="${CC}" LDFLAGS="${LDFLAGS}" \ - CFLAGS="${CFLAGS}" CCFLAGS="${CFLAGS}" \ - HOSTTYPE="$($SHELL bin/package host canon $XBPS_CROSS_TRIPLET)" -} - -do_install() { - cd arch/*/ - vbin bin/ksh ksh93 - vbin bin/shcomp +post_install() { vmkdir usr/share/ksh - vcopy fun usr/share/ksh/functions - vman man/man1/sh.1 ksh93.1 + vcopy src/cmd/ksh93/fun usr/share/ksh/functions vlicense ${FILESDIR}/LICENSE }