From owner-svn-ports-head@FreeBSD.ORG Tue Feb 18 08:44:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C33E757; Tue, 18 Feb 2014 08:44:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0E1431B2D; Tue, 18 Feb 2014 08:44:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1I8iSev026448; Tue, 18 Feb 2014 08:44:28 GMT (envelope-from rodrigo@svn.freebsd.org) Received: (from rodrigo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1I8iSFZ026445; Tue, 18 Feb 2014 08:44:28 GMT (envelope-from rodrigo@svn.freebsd.org) Message-Id: <201402180844.s1I8iSFZ026445@svn.freebsd.org> From: Rodrigo Osorio Date: Tue, 18 Feb 2014 08:44:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344843 - in head/shells/pdksh: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2014 08:44:29 -0000 Author: rodrigo Date: Tue Feb 18 08:44:28 2014 New Revision: 344843 URL: http://svnweb.freebsd.org/changeset/ports/344843 QAT: https://qat.redports.org/buildarchive/r344843/ Log: Fix ksh after 10.0 by using a posix compliant syntax for sort invocation. Fix staging PR: ports/181438 Submitted by: Chweigert Udo Reviewed by: bapt (mentor) Added: head/shells/pdksh/files/patch-siglist.sh (contents, props changed) Modified: head/shells/pdksh/Makefile head/shells/pdksh/pkg-plist Modified: head/shells/pdksh/Makefile ============================================================================== --- head/shells/pdksh/Makefile Tue Feb 18 08:41:22 2014 (r344842) +++ head/shells/pdksh/Makefile Tue Feb 18 08:44:28 2014 (r344843) @@ -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 -.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 Added: head/shells/pdksh/files/patch-siglist.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/pdksh/files/patch-siglist.sh Tue Feb 18 08:44:28 2014 (r344843) @@ -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; } + { Modified: head/shells/pdksh/pkg-plist ============================================================================== --- head/shells/pdksh/pkg-plist Tue Feb 18 08:41:22 2014 (r344842) +++ head/shells/pdksh/pkg-plist Tue Feb 18 08:44:28 2014 (r344843) @@ -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