6 files changed, 14 insertions, 91 deletions

diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile
index 1d67558dee28..5ce68901b69d 100644
--- a/shells/ksh93/Makefile
+++ b/shells/ksh93/Makefile
@@ -6,31 +6,25 @@
 
 PORTNAME=	ksh93
 PORTVERSION=	${VERSION:S/-//g}
-VERSION=	2001-07-04.0000
+VERSION=	2001-10-31
 CATEGORIES=	shells
 MASTER_SITES=	http://www.research.att.com/~gsf/download/tgz/
+DISTNAME=	${PORTNAME}-${VERSION}
+DISTFILES=	INIT.${VERSION}.tgz ast-ksh.${VERSION}.tgz
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	naddy@FreeBSD.org
 
 RESTRICTED=	"Source recipient must acknowledge license"
-DISTNAME=	${PORTNAME}-${VERSION}
-DISTFILES=	INIT.${VERSION}.tgz ast-ksh.${VERSION}.tgz
 
 NO_WRKSUBDIR=	yes
 MAKE_ARGS=	CC='${CC}' CCFLAGS='${CFLAGS}' SHELL='${SH}'
-#.if defined(WANT_STATIC)	# broken
-#MAKE_ARGS+=	LDFLAGS=-static
-#.endif
+.if defined(WANT_STATIC)
+MAKE_ARGS+=	LDFLAGS=-static
+.endif
 
 MAN1=		ksh93.1
 
-.if defined(ACCEPT_AST_LICENSE)
-post-patch:
-	@${TOUCH} ${WRKSRC}/lib/package/gen/ast.license.accepted
-.else
-IS_INTERACTIVE=	yes	# must acknowledge license
-.endif
-
 do-build:
 	@cd ${WRKSRC}; ./bin/package make ${MAKE_ARGS}
 
diff --git a/shells/ksh93/distinfo b/shells/ksh93/distinfo
index 12c5a11b6afa..a69f54fd9bda 100644
--- a/shells/ksh93/distinfo
+++ b/shells/ksh93/distinfo
@@ -1,2 +1,2 @@
-MD5 (INIT.2001-07-04.0000.tgz) = eda56098b7c43835b94ce9c0bcc13d06
-MD5 (ast-ksh.2001-07-04.0000.tgz) = 8b564bb0640f286c97bf1359a6a19260
+MD5 (ksh93/INIT.2001-10-31.tgz) = cd39294c5251b006fc7ff9e0c7b68f57
+MD5 (ksh93/ast-ksh.2001-10-31.tgz) = 6d0fc29022150da0533db90d5945b2f3
diff --git a/shells/ksh93/files/patch-src_lib_libast_comp_wc.c b/shells/ksh93/files/patch-src_lib_libast_comp_wc.c
deleted file mode 100644
index 60329af80194..000000000000
--- a/shells/ksh93/files/patch-src_lib_libast_comp_wc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/lib/libast/comp/wc.c.orig	Mon Oct  8 03:21:02 2001
-+++ src/lib/libast/comp/wc.c	Mon Oct  8 03:21:20 2001
-@@ -63,7 +63,6 @@
- wcrtomb(char* s, wchar_t c, mbstate_t* q)
- {
- #if _lib_wctomb
--	*q = 0;
- 	memset(q, 0, sizeof(*q));
- 	return wctomb(s, c);
- #else
diff --git a/shells/ksh93/files/patch-src_lib_libast_features_float b/shells/ksh93/files/patch-src_lib_libast_features_float
deleted file mode 100644
index dd83db9b7912..000000000000
--- a/shells/ksh93/files/patch-src_lib_libast_features_float
+++ /dev/null
@@ -1,37 +0,0 @@
-
-$FreeBSD$
-
---- src/lib/libast/features/float.orig	Wed Oct 10 14:10:50 2001
-+++ src/lib/libast/features/float	Wed Oct 10 14:12:26 2001
-@@ -125,6 +125,7 @@
- 		else
- 			printf("#define UINTMAX_DIG		ULONG_DIG\n");
- 		printf("\n");
-+	#if !defined(__alpha__)		/* ksh93 doesn't use this */
- 		f = 1;
- 		w = 1;
- 		do
-@@ -145,6 +146,7 @@
- 		}
- 		else
- 			printf("#define FLT_UINTMAX_MAX		FLT_ULONG_MAX\n");
-+	#endif
- 	#ifdef FLT_DIG
- 		s = FLT_DIG;
- 	#else
-@@ -256,6 +258,7 @@
- 		printf("#endif\n");
- 
- 		printf("\n");
-+	#if !defined(__alpha__)		/* ksh93 doesn't use this */
- 		d = 1.0;
- 		w = 1;
- 		do
-@@ -276,6 +279,7 @@
- 		}
- 		else
- 			printf("#define DBL_UINTMAX_MAX		DBL_ULONG_MAX\n");
-+	#endif
- 	#ifdef DBL_DIG
- 		s = DBL_DIG;
- 	#else
diff --git a/shells/ksh93/pkg-descr b/shells/ksh93/pkg-descr
index ee3150bac1cd..bf8e86bc812d 100644
--- a/shells/ksh93/pkg-descr
+++ b/shells/ksh93/pkg-descr
@@ -11,3 +11,8 @@ in performance.  In addition, "sh" scripts can be run on KSH-93
 without modification.
 
 WWW: http://www.kornshell.com/
+
+Known problem:  Defining the LC_NUMERIC environment variable, or
+any locale setting by which it is implied (LANG, LC_ALL), will cause
+ksh93 to crash.  LC_COLLATE, LC_CTYPE, LC_MESSAGES, LC_MONETARY,
+and LC_TIME are safe.
diff --git a/shells/ksh93/pkg-message b/shells/ksh93/pkg-message
deleted file mode 100644
index 2083eb413af7..000000000000
--- a/shells/ksh93/pkg-message
+++ /dev/null
@@ -1,26 +0,0 @@
-This product contains certain software code or other information
-("AT&T Software") proprietary to AT&T Corp. ("AT&T").  The AT&T
-Software is provided to you "AS IS".  YOU ASSUME TOTAL RESPONSIBILITY
-AND RISK FOR USE OF THE AT&T SOFTWARE.  AT&T DOES NOT MAKE, AND
-EXPRESSLY DISCLAIMS, ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND
-WHATSOEVER, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, WARRANTIES
-OF TITLE OR NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS,
-ANY WARRANTIES ARISING BY USAGE OF TRADE, COURSE OF DEALING OR
-COURSE OF PERFORMANCE, OR ANY WARRANTY THAT THE AT&T SOFTWARE IS
-"ERROR FREE" OR WILL MEET YOUR REQUIREMENTS.
-
-Unless you accept a license to use the AT&T Software, you shall not
-reverse compile, disassemble or otherwise reverse engineer this
-product to ascertain the source code for any AT&T Software.
-
-(c) AT&T Corp. All rights reserved. AT&T is a registered trademark
-of AT&T Corp.
-
-------------------------------------------------------------------------
-
-Known problem:  Defining the LC_NUMERIC environment variable, or
-any locale setting by which it is implied (LANG, LC_ALL), will cause
-ksh93 to crash.  LC_COLLATE, LC_CTYPE, LC_MESSAGES, LC_MONETARY,
-and LC_TIME are safe.
-