From a5474af2058d45ece3b53b39d6c0a1132a5f3973 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Wed, 28 Mar 2012 19:26:44 +0000 Subject: [PATCH] - Update to 2012-02-29 - Add LICENSE Changes: http://www2.research.att.com/~gsf/download/gen/ast-ksh.html#ksh93 changes http://www2.research.att.com/~gsf/download/gen/INIT.html#INIT changes Feature safe: yes --- shells/ksh93/Makefile | 11 ++++++----- shells/ksh93/distinfo | 8 ++++---- shells/ksh93/files/patch-src-cmd-ksh93-sh-jobs.c | 10 ---------- 3 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 shells/ksh93/files/patch-src-cmd-ksh93-sh-jobs.c diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile index 783d57b04bad..b1c6912eead6 100644 --- a/shells/ksh93/Makefile +++ b/shells/ksh93/Makefile @@ -17,7 +17,6 @@ PORTNAME= ksh93 PORTVERSION= ${KSHVERSION:S/-//g} -PORTREVISION= 3 CATEGORIES= shells MASTER_SITES= http://www.research.att.com/~gsf/download/tgz/ DISTFILES= INIT.${INITVERSION}.tgz ast-ksh.${KSHVERSION}.tgz @@ -26,6 +25,8 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Official AT&T release of KornShell 93 +LICENSE= EPL + OPTIONS= STATIC "Static linking" off RESTRICTED= Source recipient must acknowledge license @@ -37,8 +38,8 @@ NO_WRKSUBDIR= yes MAN1= ksh93.1 -INITVERSION= 2012-01-01 -KSHVERSION= 2011-02-08 +INITVERSION= 2012-02-29 +KSHVERSION= 2012-02-29 .include @@ -51,7 +52,7 @@ post-patch: ${WRKSRC}/bin/package ${WRKSRC}/src/cmd/INIT/package.sh do-build: - @cd ${WRKSRC} && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make + @cd ${WRKSRC}/ && ${SETENV} -i ${MAKE_ENV} ${SH} bin/package flat make do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ksh ${PREFIX}/bin/ksh93 @@ -67,7 +68,7 @@ post-install: @${ECHO} ${PREFIX}/bin/ksh93 >> /etc/shells test: build - @cd ${WRKSRC}/src/cmd/ksh93/tests && \ + @cd ${WRKSRC}/src/cmd/ksh93/tests/ && \ ${SETENV} SHELL=${WRKSRC}/bin/ksh ${WRKSRC}/bin/ksh shtests .include diff --git a/shells/ksh93/distinfo b/shells/ksh93/distinfo index 8bf8d172ad18..c6a0a031e743 100644 --- a/shells/ksh93/distinfo +++ b/shells/ksh93/distinfo @@ -1,4 +1,4 @@ -SHA256 (ksh93/INIT.2012-01-01.tgz) = 60d9a57885f2f37affb6ddab6090275d715236058561f333f351566bedcc2cd1 -SIZE (ksh93/INIT.2012-01-01.tgz) = 376375 -SHA256 (ksh93/ast-ksh.2011-02-08.tgz) = 581e317d36ef55505329b5b67b6bc2208b496638a466cad18c6674b60449b01d -SIZE (ksh93/ast-ksh.2011-02-08.tgz) = 1961338 +SHA256 (ksh93/INIT.2012-02-29.tgz) = da4a886d28f75f8a011d522697272cd196cdcfb406f92d47f8b0a6608d786896 +SIZE (ksh93/INIT.2012-02-29.tgz) = 379873 +SHA256 (ksh93/ast-ksh.2012-02-29.tgz) = d09a2002bd458748960adf0899565b12c195e319101af08eb2f9f821581c8b4e +SIZE (ksh93/ast-ksh.2012-02-29.tgz) = 2027575 diff --git a/shells/ksh93/files/patch-src-cmd-ksh93-sh-jobs.c b/shells/ksh93/files/patch-src-cmd-ksh93-sh-jobs.c deleted file mode 100644 index 1fec0eb2ff96..000000000000 --- a/shells/ksh93/files/patch-src-cmd-ksh93-sh-jobs.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/cmd/ksh93/sh/jobs.c.orig 2010-12-02 00:57:47.000000000 +0800 -+++ src/cmd/ksh93/sh/jobs.c 2011-10-05 10:52:30.844946545 +0800 -@@ -945,6 +945,7 @@ - if(!(pw = job_bypid(pid))) - { - pw = &dummy; -+ pw->p_shp = sh_getinterp(); - pw->p_pid = pid; - pw->p_pgrp = pid; - }