Update ksh93 to 2001-07-04.0000 version. Earlier distfiles are no

longer available from AT&T.

Add DIST_SUBDIR.

PR:  28879
Submitted by:  maintainer

9 files changed, 26 insertions, 152 deletions

diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile
index 3a923caef4a4..504ffd9449df 100644
--- a/shells/ksh93/Makefile
+++ b/shells/ksh93/Makefile
@@ -5,18 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	ksh93
-PORTVERSION= 	${VERSION:S/-//g}
-VERSION=	2001-01-01.0000
+PORTVERSION=	${VERSION:S/-//g}
+VERSION=	2001-07-04.0000
 CATEGORIES=	shells
 MASTER_SITES=	http://www.research.att.com/~gsf/download/tgz/
 
-MAINTAINER=	Christian Weisgerber <naddy@mips.inka.de>
-
-RESTRICTED=	"Impenetrable license"
-IS_INTERACTIVE=	yes	# must acknowledge license
+MAINTAINER=	naddy@mips.inka.de
 
+RESTRICTED=	"Source recipient must acknowledge license"
 DISTNAME=	${PORTNAME}-${VERSION}
 DISTFILES=	INIT.${VERSION}.tgz ast-ksh.${VERSION}.tgz
+DIST_SUBDIR=	${PORTNAME}
 
 NO_WRKSUBDIR=	yes
 MAKE_ARGS=	CC='${CC}' CCFLAGS='${CFLAGS}' SHELL='${SH}'
@@ -26,8 +25,15 @@ MAKE_ARGS+=	LDFLAGS=-static
 
 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}
+	@cd ${WRKSRC}; ./bin/package make ${MAKE_ARGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/arch/freebsd.${ARCH}/bin/ksh \
diff --git a/shells/ksh93/distinfo b/shells/ksh93/distinfo
index a7c3c03cd82e..1dd3e937816e 100644
--- a/shells/ksh93/distinfo
+++ b/shells/ksh93/distinfo
@@ -1,2 +1,2 @@
-MD5 (INIT.2001-01-01.0000.tgz) = 799b061ff85c22e7efc9a3b9e610e5c6
-MD5 (ast-ksh.2001-01-01.0000.tgz) = e823dfd2b97a85e7b6b06612a06711a7
+MD5 (ksh93/INIT.2001-07-04.0000.tgz) = 5cb81cd79b6c4ffbd3249550541afa52
+MD5 (ksh93/ast-ksh.2001-07-04.0000.tgz) = 95c4d371f2c144759aad029f20717481
diff --git a/shells/ksh93/files/patch-src_cmd_INIT_mamake_c b/shells/ksh93/files/patch-src_cmd_INIT_mamake_c
deleted file mode 100644
index f17ac44b1b94..000000000000
--- a/shells/ksh93/files/patch-src_cmd_INIT_mamake_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
---- src/cmd/INIT/mamake.c.orig	Fri Sep 22 00:38:32 2000
-+++ src/cmd/INIT/mamake.c	Thu Dec 28 18:26:19 2000
-@@ -98,6 +98,8 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include <ctype.h>
- #include <sys/types.h>
diff --git a/shells/ksh93/files/patch-src_cmd_INIT_proto_c b/shells/ksh93/files/patch-src_cmd_INIT_proto_c
deleted file mode 100644
index cbb284a0cde1..000000000000
--- a/shells/ksh93/files/patch-src_cmd_INIT_proto_c
+++ /dev/null
@@ -1,52 +0,0 @@
-$FreeBSD$
---- src/cmd/INIT/proto.c.orig	Thu Oct 26 16:00:44 2000
-+++ src/cmd/INIT/proto.c	Thu Dec 28 18:26:19 2000
-@@ -1531,6 +1531,7 @@
- 
- 
- 
-+extern __MANGLE__ __V_*		realloc __PROTO__((__V_*, int));
- extern __MANGLE__ __V_*		calloc __PROTO__((int, int));
- extern __MANGLE__ char*		ctime __PROTO__((time_t*));
- extern __MANGLE__ void		free __PROTO__((__V_*));
-@@ -3965,7 +3966,7 @@
- 	if ((n = ip - bp - 1) > 0)
- 	{
- 		ip = bp;
--		do switch( n) { default : memcpy( op, ip, n); op += n; ip += n; break; case 7 : * op++ = * ip++; case 6 : * op++ = * ip++; case 5 : * op++ = * ip++; case 4 : * op++ = * ip++; case 3 : * op++ = * ip++; case 2 : * op++ = * ip++; case 1 : * op++ = * ip++; case 0 : break; } while (0);
-+		do switch( n) { default : memcopy( op, ip, n); op += n; ip += n; break; case 7 : * op++ = * ip++; case 6 : * op++ = * ip++; case 5 : * op++ = * ip++; case 4 : * op++ = * ip++; case 3 : * op++ = * ip++; case 2 : * op++ = * ip++; case 1 : * op++ = * ip++; case 0 : break; } while (0);
- 		ip++;
- 	}
- 	state = ~state;
-@@ -5835,11 +5836,11 @@
- 				pppclose(b);
- 				return flags | ((1<<13)<<0);
- 			}
--			strcpy(buf, copy);
-+			strcopy(buf, copy);
- 			e = buf + n;
- 			if (*file != '/')
- 				*e++ = '/';
--			strcpy(e, file);
-+			strcopy(e, file);
- 			if ((fd = creat(buf, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0)
- 			{
- 				for (e = buf; *e == '/'; e++);
-@@ -5882,7 +5883,7 @@
- 		if (file && (flags & ((1<<13)<<1)))
- 		{
- 			*e = '_';
--			strcpy(b, file);
-+			strcopy(b, file);
- 			*e = x;
- 			if (replace(b, file, !(flags & (1<<0))))
- 				proto_error(b, 2, "cannot rename to", file);
-@@ -5977,7 +5978,7 @@
- 				else
- 				{
- 					*op++ = '\n';
--					memcpy(op, b, n + 1);
-+					memcopy(op, b, n + 1);
- 					op += n;
- 				}
- 				break;
diff --git a/shells/ksh93/files/patch-src_cmd_ksh93_Mamfile b/shells/ksh93/files/patch-src_cmd_ksh93_Mamfile
deleted file mode 100644
index c3e0089ea823..000000000000
--- a/shells/ksh93/files/patch-src_cmd_ksh93_Mamfile
+++ /dev/null
@@ -1,31 +0,0 @@
-$FreeBSD$
---- src/cmd/ksh93/Mamfile.orig	Sat Feb 17 23:27:39 2001
-+++ src/cmd/ksh93/Mamfile	Sat Feb 17 23:28:35 2001
-@@ -1117,12 +1117,12 @@
- done sh/shcomp.c
- prev sh/shcomp.c
- setv _BLD_shell -U_BLD_shell
--exec - ${CC} -O  -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSH_DICT='(void*)e_dict' -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_VSH -DSHOPT_ESH -c sh/shcomp.c
-+exec - ${CC} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -DSH_DICT='(void*)e_dict' -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_VSH -DSHOPT_ESH -c sh/shcomp.c
- done shcomp.o generated
- prev libshell.a archive
- setv mam_libshell `sed -e 's,-lshell,libshell.a,' shell.req`
- prev ${mam_libdl}
--exec - ${CC} -O ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${PACKAGE_ast_LIB}}  -o shcomp shcomp.o ${mam_libshell} ${mam_libm} ${mam_cc_static}  ${mam_cc_dynamic} ${mam_libast}
-+exec - ${CC} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${PACKAGE_ast_LIB}}  -o shcomp shcomp.o ${mam_libshell} ${mam_libm} ${mam_cc_static}  ${mam_cc_dynamic} ${mam_libast}
- done shcomp generated
- make sh/suid_exec.c
- prev ${PACKAGE_ast_INCLUDE}/error.h implicit
-@@ -1139,10 +1139,10 @@
- make suid_exec.o
- prev sh/suid_exec.c
- prev sh/suid_exec.c
--exec - ${CC} -O  -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c sh/suid_exec.c
-+exec - ${CC} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c sh/suid_exec.c
- done suid_exec.o generated
- prev ${mam_libdl}
--exec - ${CC} -O ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${PACKAGE_ast_LIB}}  -o suid_exec suid_exec.o ${mam_cc_static} ${mam_libast} ${mam_cc_dynamic} ${mam_libm} ${mam_cc_static}  ${mam_cc_dynamic} ${mam_libast}
-+exec - ${CC} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${PACKAGE_ast_LIB}}  -o suid_exec suid_exec.o ${mam_cc_static} ${mam_libast} ${mam_cc_dynamic} ${mam_libm} ${mam_cc_static}  ${mam_cc_dynamic} ${mam_libast}
- done suid_exec generated
- make ${INSTALLROOT}/bin
- exec - set -
diff --git a/shells/ksh93/files/patch-src_lib_libast_comp_wc.c b/shells/ksh93/files/patch-src_lib_libast_comp_wc.c
new file mode 100644
index 000000000000..734d77f25bba
--- /dev/null
+++ b/shells/ksh93/files/patch-src_lib_libast_comp_wc.c
@@ -0,0 +1,11 @@
+--- src/lib/libast/comp/wc.c.orig	Fri May  4 00:29:32 2001
++++ src/lib/libast/comp/wc.c	Fri Aug  3 19:04:19 2001
+@@ -63,7 +63,7 @@
+ wcrtomb(char* s, wchar_t c, mbstate_t* q)
+ {
+ #if _lib_wctomb
+-	*q = 0;
++	bzero(q, sizeof(q));
+ 	return wctomb(s, c);
+ #else
+ 	if (s)
diff --git a/shells/ksh93/files/patch-src_lib_libast_features_limits_c b/shells/ksh93/files/patch-src_lib_libast_features_limits_c
deleted file mode 100644
index d6daa9dd4268..000000000000
--- a/shells/ksh93/files/patch-src_lib_libast_features_limits_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
---- src/lib/libast/features/limits.c.orig	Tue Feb  9 15:23:43 1999
-+++ src/lib/libast/features/limits.c	Thu Dec 28 19:35:20 2000
-@@ -122,6 +122,7 @@
- 	while (uc >>= 1) val++;
- #endif
- 	printf("#define CHAR_BIT	%lu\n", val);
-+#undef MB_LEN_MAX
- #ifdef MB_LEN_MAX
- 	val = MB_LEN_MAX;
- 	printf("#undef	MB_LEN_MAX\n");
-@@ -392,6 +393,9 @@
- #endif
- #ifdef	_LIMITS_H_
- 	printf("#define _LIMITS_H_\n");
-+#endif
-+#ifdef	_MACHINE_LIMITS_H
-+	printf("#define _MACHINE_LIMITS_H_");
- #endif
- #ifdef	__LIMITS_H
- 	printf("#define __LIMITS_H\n");
diff --git a/shells/ksh93/files/patch-src_lib_libast_features_sfio b/shells/ksh93/files/patch-src_lib_libast_features_sfio
deleted file mode 100644
index fc7349b90f61..000000000000
--- a/shells/ksh93/files/patch-src_lib_libast_features_sfio
+++ /dev/null
@@ -1,9 +0,0 @@
-$FreeBSD$
---- src/lib/libast/features/sfio.orig	Thu Dec 28 02:40:45 2000
-+++ src/lib/libast/features/sfio	Thu Dec 28 02:40:52 2000
-@@ -1,4 +1,4 @@
--hdr	float,floatingpoint,math,values
-+hdr	float,floatingpoint,math
- sys	filio,ioctl
- lib	qfrexp,qldexp
- 
diff --git a/shells/ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h b/shells/ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h
deleted file mode 100644
index cab78989d94f..000000000000
--- a/shells/ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h
+++ /dev/null
@@ -1,18 +0,0 @@
-$FreeBSD$
---- src/lib/libast/vmalloc/vmhdr.h.orig	Thu Dec 28 00:07:39 2000
-+++ src/lib/libast/vmalloc/vmhdr.h	Thu Dec 28 00:08:18 2000
-@@ -56,12 +56,12 @@
- #include	<ast_common.h>
- #include	"FEATURE/vmalloc"
- 
-+#endif /*_PACKAGE_ast*/
-+
- #if !_UWIN
- #define _npt_getpagesize	1
- #define _npt_sbrk		1
- #endif
--
--#endif /*_PACKAGE_ast*/
- 
- #undef free
- #undef malloc