Date: Tue, 10 Jul 2001 22:05:30 +0200 (CEST) From: Christian Weisgerber <naddy@mips.inka.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/28879: update shells/ksh93 to 2001-07-04.0000 Message-ID: <200107102005.f6AK5Uq04218@kemoauc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
>Number: 28879
>Category: ports
>Synopsis: update shells/ksh93 to 2001-07-04.0000
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 10 13:10:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Christian Weisgerber
>Release: FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:
System: FreeBSD kemoauc.mips.inka.de 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon May 14 00:29:21 CEST 2001 root@:/home/obj/usr/src/sys/KEMOAUC alpha
>Description:
AT&T did a new release of their ast-ksh package, 2001-07-04.0000,
and removed the old distfiles. The attached patch brings the
shell/ksh93 port up to the new release.
>How-To-Repeat:
>Fix:
diff -uNr /usr/ports/shells/ksh93/Makefile ksh93/Makefile
--- /usr/ports/shells/ksh93/Makefile Wed Feb 28 13:51:19 2001
+++ ksh93/Makefile Tue Jul 10 21:47:32 2001
@@ -6,15 +6,13 @@
PORTNAME= ksh93
PORTVERSION= ${VERSION:S/-//g}
-VERSION= 2001-01-01.0000
+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
@@ -26,8 +24,15 @@
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 -uNr /usr/ports/shells/ksh93/distinfo ksh93/distinfo
--- /usr/ports/shells/ksh93/distinfo Tue Feb 27 13:20:40 2001
+++ ksh93/distinfo Mon Jul 9 02:08:46 2001
@@ -1,2 +1,2 @@
-MD5 (INIT.2001-01-01.0000.tgz) = 799b061ff85c22e7efc9a3b9e610e5c6
-MD5 (ast-ksh.2001-01-01.0000.tgz) = e823dfd2b97a85e7b6b06612a06711a7
+MD5 (INIT.2001-07-04.0000.tgz) = 5cb81cd79b6c4ffbd3249550541afa52
+MD5 (ast-ksh.2001-07-04.0000.tgz) = 95c4d371f2c144759aad029f20717481
diff -uNr /usr/ports/shells/ksh93/files/patch-src_cmd_INIT_mamake_c ksh93/files/patch-src_cmd_INIT_mamake_c
--- /usr/ports/shells/ksh93/files/patch-src_cmd_INIT_mamake_c Mon Feb 26 06:14:17 2001
+++ ksh93/files/patch-src_cmd_INIT_mamake_c Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$FreeBSD: ports/shells/ksh93/files/patch-src_cmd_INIT_mamake_c,v 1.1 2001/02/26 05:14:17 steve Exp $
---- 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 -uNr /usr/ports/shells/ksh93/files/patch-src_cmd_INIT_proto_c ksh93/files/patch-src_cmd_INIT_proto_c
--- /usr/ports/shells/ksh93/files/patch-src_cmd_INIT_proto_c Mon Feb 26 06:14:17 2001
+++ ksh93/files/patch-src_cmd_INIT_proto_c Thu Jan 1 01:00:00 1970
@@ -1,52 +0,0 @@
-$FreeBSD: ports/shells/ksh93/files/patch-src_cmd_INIT_proto_c,v 1.1 2001/02/26 05:14:17 steve Exp $
---- 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 -uNr /usr/ports/shells/ksh93/files/patch-src_cmd_ksh93_Mamfile ksh93/files/patch-src_cmd_ksh93_Mamfile
--- /usr/ports/shells/ksh93/files/patch-src_cmd_ksh93_Mamfile Mon Feb 26 06:14:17 2001
+++ ksh93/files/patch-src_cmd_ksh93_Mamfile Thu Jan 1 01:00:00 1970
@@ -1,31 +0,0 @@
-$FreeBSD: ports/shells/ksh93/files/patch-src_cmd_ksh93_Mamfile,v 1.1 2001/02/26 05:14:17 steve Exp $
---- 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 -uNr /usr/ports/shells/ksh93/files/patch-src_lib_libast_features_limits_c ksh93/files/patch-src_lib_libast_features_limits_c
--- /usr/ports/shells/ksh93/files/patch-src_lib_libast_features_limits_c Mon Feb 26 06:14:17 2001
+++ ksh93/files/patch-src_lib_libast_features_limits_c Thu Jan 1 01:00:00 1970
@@ -1,21 +0,0 @@
-$FreeBSD: ports/shells/ksh93/files/patch-src_lib_libast_features_limits_c,v 1.1 2001/02/26 05:14:17 steve Exp $
---- 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 -uNr /usr/ports/shells/ksh93/files/patch-src_lib_libast_features_sfio ksh93/files/patch-src_lib_libast_features_sfio
--- /usr/ports/shells/ksh93/files/patch-src_lib_libast_features_sfio Mon Feb 26 06:14:17 2001
+++ ksh93/files/patch-src_lib_libast_features_sfio Thu Jan 1 01:00:00 1970
@@ -1,9 +0,0 @@
-$FreeBSD: ports/shells/ksh93/files/patch-src_lib_libast_features_sfio,v 1.1 2001/02/26 05:14:17 steve Exp $
---- 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 -uNr /usr/ports/shells/ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h
--- /usr/ports/shells/ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h Mon Feb 26 06:14:17 2001
+++ ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h Thu Jan 1 01:00:00 1970
@@ -1,18 +0,0 @@
-$FreeBSD: ports/shells/ksh93/files/patch-src_lib_libast_vmalloc_vmhdr_h,v 1.1 2001/02/26 05:14:17 steve Exp $
---- 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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107102005.f6AK5Uq04218>