diff options
| author | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2014-02-18 08:44:28 +0000 |
|---|---|---|
| committer | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2014-02-18 08:44:28 +0000 |
| commit | 66735958b60128f80d469471a2b8e7e19cdd387d (patch) | |
| tree | ce9f6630cff7781e2ad0c318a2d17546decf01f4 /shells | |
| parent | Correct graphics/hs-HGL entry. (diff) | |
Fix ksh after 10.0 by using a posix compliant syntax for sort invocation.
Fix staging
PR: ports/181438
Submitted by: Chweigert Udo <Udo.Schweigert@siemens.com>
Reviewed by: bapt (mentor)
Notes
Notes:
svn path=/head/; revision=344843
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/pdksh/Makefile | 10 | ||||
| -rw-r--r-- | shells/pdksh/files/patch-siglist.sh | 11 | ||||
| -rw-r--r-- | shells/pdksh/pkg-plist | 1 |
3 files changed, 14 insertions, 8 deletions
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile index 1776faf4d554..b9d4b656a9e4 100644 --- a/shells/pdksh/Makefile +++ b/shells/pdksh/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdksh PORTVERSION= 5.2.14p2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= shells MASTER_SITES= http://gd.tuwien.ac.at/utils/shells/pdksh/ \ ftp://ftp.lip6.fr/pub/unix/shells/pdksh/ \ @@ -17,18 +17,12 @@ PATCH_DIST_STRIP= -p2 MAINTAINER= rodrigo@FreeBSD.org COMMENT= The Public Domain Korn Shell -LICENSE= BSD +LICENSE= BSD3CLAUSE GNU_CONFIGURE= yes -MAN1= ksh.1 -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${OSVERSION} >= 1000039 -BROKEN= hangs on 10.0: http://www.freebsd.org/cgi/query-pr.cgi?pr=181438 -.endif - .if defined(WITH_STATIC) CONFIGURE_ENV+= LDSTATIC=-static .endif diff --git a/shells/pdksh/files/patch-siglist.sh b/shells/pdksh/files/patch-siglist.sh new file mode 100644 index 000000000000..924097af104b --- /dev/null +++ b/shells/pdksh/files/patch-siglist.sh @@ -0,0 +1,11 @@ +--- siglist.sh 2014-02-12 11:26:07.000000000 +0100 ++++ siglist.sh 2014-02-12 11:26:22.000000000 +0100 +@@ -23,7 +23,7 @@ + { QwErTy SIG\1 , "\1", "\2" },\ + #endif/') > $in + $CPP $in > $out +-sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort +2n +0n | ++sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort -k3n -k1n | + sed 's/^[0-9]* //' | + awk 'BEGIN { last=0; nsigs=0; } + { diff --git a/shells/pdksh/pkg-plist b/shells/pdksh/pkg-plist index 4200e6156edd..bf663d281265 100644 --- a/shells/pdksh/pkg-plist +++ b/shells/pdksh/pkg-plist @@ -1,3 +1,4 @@ bin/ksh +man/man1/ksh.1.gz @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells |