diff options
| -rw-r--r-- | shells/ast-ksh/Makefile.common | 14 | ||||
| -rw-r--r-- | shells/ast-ksh/distinfo | 18 | ||||
| -rw-r--r-- | shells/ast-ksh/patches/patch-aa | 12 | ||||
| -rw-r--r-- | shells/ast-ksh/patches/patch-ab | 14 | ||||
| -rw-r--r-- | shells/ast-ksh/patches/patch-ac | 16 |
5 files changed, 20 insertions, 54 deletions
diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common index ef7f7a9a483..c34b577efa5 100644 --- a/shells/ast-ksh/Makefile.common +++ b/shells/ast-ksh/Makefile.common @@ -1,13 +1,11 @@ -# $NetBSD: Makefile.common,v 1.28 2012/05/04 16:51:18 joerg Exp $ +# $NetBSD: Makefile.common,v 1.29 2012/05/25 17:08:46 asau Exp $ DISTNAME= ast-ksh-${ASTKSH_VERSION} PKGNAME= ast-ksh-${ASTKSH_VERSION:S/-//g} -PKGREVISION= 1 CATEGORIES= shells -MASTER_SITES= http://ftp.ntua.gr/pub/linux/openpkg/sources/DST/ksh/ \ - ftp://ftp.ntua.gr/pub/linux/openpkg/sources/DST/ksh/ \ - http://pkgs.fedoraproject.org/repo/pkgs/ksh/ast-ksh.2006-02-14.tgz/76a13bdb10a35b5ff67208cf9042a8bf/ \ - http://pkgs.fedoraproject.org/repo/pkgs/ksh/INIT.2006-02-14.tgz/375ede1f75db451f645a140ec41b9216/ +# originally at http://www2.research.att.com/~gsf/download/tgz/ +# but it requires authentication +MASTER_SITES= ${MASTER_SITE_LOCAL} DISTFILES= INIT.${ASTKSH_VERSION}.tgz ast-ksh.${ASTKSH_VERSION}.tgz MAINTAINER= pkgsrc-users@NetBSD.org @@ -16,8 +14,6 @@ COMMENT= Official AT&T release of KornShell 93 NOT_FOR_PLATFORM= Interix-*-* # taking nearly a day to build and crash! -BROKEN= Hangs during build - CONFLICTS= static-ast-ksh-[0-9]* KSH93_MAKEFLAGS= @@ -27,7 +23,7 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM=${RESTRICTED} NO_SRC_ON_FTP= ${RESTRICTED} -ASTKSH_VERSION= 2006-02-14 +ASTKSH_VERSION= 2012-02-29 WRKSRC= ${WRKDIR} MAKE_FLAGS+= CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q} diff --git a/shells/ast-ksh/distinfo b/shells/ast-ksh/distinfo index 68f87d3affd..9bc0a0c0e99 100644 --- a/shells/ast-ksh/distinfo +++ b/shells/ast-ksh/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.12 2009/07/14 09:14:04 hasso Exp $ +$NetBSD: distinfo,v 1.13 2012/05/25 17:08:46 asau Exp $ -SHA1 (INIT.2006-02-14.tgz) = 4661c72187bff2cd5fa3558ee7c0c22dd3ba5f39 -RMD160 (INIT.2006-02-14.tgz) = 68649532a15c34dcb20d61a544c1594d030c5f3f -Size (INIT.2006-02-14.tgz) = 317116 bytes -SHA1 (ast-ksh.2006-02-14.tgz) = 70edb56100f77bc53dcfe664b6479fa96c640d1b -RMD160 (ast-ksh.2006-02-14.tgz) = e4ac75119e4678af2c90cb3a1a28805ad380e9dd -Size (ast-ksh.2006-02-14.tgz) = 1575902 bytes -SHA1 (patch-aa) = dd3e5cc9b80ae6e24faed3f15af354cf34fb16a0 -SHA1 (patch-ab) = adbbdb5deeb15c1eeb38bec5685d9e6331b2b964 -SHA1 (patch-ac) = ee5c19ead4e27b4b2ac8430e1a98d77ea991b4a1 +SHA1 (INIT.2012-02-29.tgz) = e48f7aa9231f1e5519ee46e8708be8241467d354 +RMD160 (INIT.2012-02-29.tgz) = 283a527661df8d58a948890866990fb083607e1c +Size (INIT.2012-02-29.tgz) = 379873 bytes +SHA1 (ast-ksh.2012-02-29.tgz) = 6bdee6fe16917395b8c194e4a45ec2a14a31b778 +RMD160 (ast-ksh.2012-02-29.tgz) = 11939f779c0e0724a1ddce439a000105c67b0f2c +Size (ast-ksh.2012-02-29.tgz) = 2027575 bytes +SHA1 (patch-ab) = 98ec5d5e90f3f9bf45bdbd7199f85e932e07eada SHA1 (patch-ad) = a85c7ac72c3443e4c140ee36bbc35b2a4eb42062 diff --git a/shells/ast-ksh/patches/patch-aa b/shells/ast-ksh/patches/patch-aa deleted file mode 100644 index 527a6e2dc61..00000000000 --- a/shells/ast-ksh/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/08/12 23:28:59 kristerw Exp $ ---- src/lib/libast/comp/conf.sh.orig Wed Aug 13 00:08:55 2003 -+++ src/lib/libast/comp/conf.sh Wed Aug 13 00:10:55 2003 -@@ -266,7 +266,7 @@ - -e 's,[ ].*,,' \ - -e '/^[S_]/!d' \ - `cat $tmp.f` 2>/dev/null | --sort -u > $tmp.v -+sort -u | grep -v _O_SC_CLK_TCK > $tmp.v - case $debug in - -d2) exit ;; - esac diff --git a/shells/ast-ksh/patches/patch-ab b/shells/ast-ksh/patches/patch-ab index 8c7bc36f009..bb61d6110f5 100644 --- a/shells/ast-ksh/patches/patch-ab +++ b/shells/ast-ksh/patches/patch-ab @@ -1,11 +1,11 @@ -$NetBSD: patch-ab,v 1.1 2004/11/12 18:08:54 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2012/05/25 17:08:46 asau Exp $ ---- src/cmd/INIT/make.probe.orig 2003-06-12 12:22:25.000000000 -0400 -+++ src/cmd/INIT/make.probe -@@ -805,9 +805,7 @@ case $pic:$so:$dynamic:$static in - fi - case $so in - ?*) if $cc -c require.$src +--- src/cmd/INIT/make.probe.orig 2011-06-01 14:06:48.000000000 +0400 ++++ src/cmd/INIT/make.probe 2012-05-23 19:45:56.000000000 +0400 +@@ -930,9 +930,7 @@ + done + fi + if $cc -c require.$src - then p=' -/usr/proberun/lib:/local/runprobe/lib -' diff --git a/shells/ast-ksh/patches/patch-ac b/shells/ast-ksh/patches/patch-ac deleted file mode 100644 index ad4a1ffa238..00000000000 --- a/shells/ast-ksh/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2007/12/02 12:55:09 wiz Exp $ - ---- src/lib/libast/port/mnt.c.orig 2002-09-26 16:33:59.000000000 +0000 -+++ src/lib/libast/port/mnt.c -@@ -146,6 +146,11 @@ set(register Header_t* hp, const char* f - #include <sys/param.h> /* expect some macro redefinitions here */ - #include <sys/mount.h> - -+#if defined(__NetBSD__) && (__NetBSD_Version__ > 299000900) -+#define statfs statvfs -+#define f_flags f_flag -+#endif -+ - typedef struct - { - Header_t hdr; |