Attachment #179231 for bug #211164





PORTNAME=	ksh93
PORTVERSION=	${KSHVERSION:S/-//g}
PORTREVISION=	2
CATEGORIES=	shells
MASTER_SITES=	https://marcincieslak.com/tmp/distfiles/
		LOCAL/sunpoet/${PORTNAME}
DISTFILES=	INIT.${INITVERSION}.tgz ast-ksh.${KSHVERSION}.tgz
DIST_SUBDIR=	${PORTNAME}


MAKE_ENV=	CCFLAGS="${CFLAGS}"
NO_WRKSUBDIR=	yes

INITVERSION=	2014-12-24
KSHVERSION=	2016-07-16

STATIC_MAKE_ENV=	LDFLAGS+=-static


Lines 1-4 Link Here

(-)ksh93/distinfo (-4 / +5 lines)
1	SHA256 (ksh93/INIT.2013-05-24.tgz) = 118b2c8a4d651727fcd680289be69941d3045951bf9e3a4d45dcb42f0658f014	1	TIMESTAMP = 1468711452
2	SIZE (ksh93/INIT.2013-05-24.tgz) = 383979	2	SHA256 (ksh93/INIT.2014-12-24.tgz) = 66a88b56dd94fce01fd60ec5c9201ce7029c9401621ddb8030d2aed79676cc76
3	SHA256 (ksh93/ast-ksh.2012-08-01.tgz) = e6192cfa52a6a9fd20618cbaf3fa81f0cc9fd83525500757e83017275e962851	3	SIZE (ksh93/INIT.2014-12-24.tgz) = 385659
4	SIZE (ksh93/ast-ksh.2012-08-01.tgz) = 2053532	4	SHA256 (ksh93/ast-ksh.2016-07-16.tgz) = 7cc877e9bf296bce29b57e38407e249a05140f21e2d1e492476e74b426b01da1
		5	SIZE (ksh93/ast-ksh.2016-07-16.tgz) = 2283587

Lines 1-10 Link Here

(-)ksh93/files/patch-src-lib-libast-features-wchar (-10 lines)
1	--- src/lib/libast/features/wchar.orig 2012-01-12 15:40:22.000000000 +0800
2	+++ src/lib/libast/features/wchar 2012-06-12 10:05:37.278869903 +0800
3	@@ -51,6 +51,7 @@
4	run{
5	cat <<!
6	#if _hdr_wchar && defined(_nxt_wchar)
7	+ #define _STDFILE_DECLARED
8	#include ${_nxt_wchar-_nxt_wchar} /* the native wchar.h */
9	#endif
10




--- src/lib/libast/hash/hashalloc.c.orig	2013-12-28 22:09:43.000000000 +0100
+++ src/lib/libast/hash/hashalloc.c	2013-12-28 22:43:14.000000000 +0100
@@ -49,6 +49,7 @@
 	va_list*		vp = va;
 	Hash_region_f		region = 0;
 	void*			handle;
+	va_listarg		tmpval;
 
 	va_start(ap, ref);
 
@@ -151,7 +152,8 @@
 				va_copy(*vp, ap);
 				vp++;
 			}
-			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
+			tmpval = va_listval(va_arg(ap, va_listarg));
+			va_copy(ap, tmpval);
 			break;
 		case 0:
 			if (vp > va)




--- ./src/lib/libast/string/tokscan.c.orig	2013-12-28 22:16:20.000000000 +0100
+++ ./src/lib/libast/string/tokscan.c	2013-12-28 22:43:28.000000000 +0100
@@ -188,6 +188,7 @@
 	char**		p_string;
 	char*		prv_f = 0;
 	va_list		prv_ap;
+	va_listarg	tmpval;
 
 	va_start(ap, fmt);
 	if (!*s || *s == '\n')
@@ -233,7 +234,8 @@
 			prv_f = f;
 			f = va_arg(ap, char*);
 			va_copy(prv_ap, ap);
-			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
+			tmpval = va_listval(va_arg(ap, va_listarg));
+			va_copy(ap, tmpval);
 			continue;
 		case 'c':
 			p_char = va_arg(ap, char*);

Return to bug 211164

Lines 12-21 Link Here

(-)ksh93/Makefile (-5 / +3 lines)
12		12
13	PORTNAME= ksh93	13	PORTNAME= ksh93
14	PORTVERSION= ${KSHVERSION:S/-//g}	14	PORTVERSION= ${KSHVERSION:S/-//g}
15	PORTREVISION= 2
16	CATEGORIES= shells	15	CATEGORIES= shells
17	MASTER_SITES= http://www2.research.att.com/~astopen/download/tgz/ \	16	MASTER_SITES= https://marcincieslak.com/tmp/distfiles/
18	LOCAL/sunpoet/${PORTNAME}
19	DISTFILES= INIT.${INITVERSION}.tgz ast-ksh.${KSHVERSION}.tgz	17	DISTFILES= INIT.${INITVERSION}.tgz ast-ksh.${KSHVERSION}.tgz
20	DIST_SUBDIR= ${PORTNAME}	18	DIST_SUBDIR= ${PORTNAME}
21		19
Lines 31-38 Link Here
31	MAKE_ENV= CCFLAGS="${CFLAGS}"	29	MAKE_ENV= CCFLAGS="${CFLAGS}"
32	NO_WRKSUBDIR= yes	30	NO_WRKSUBDIR= yes
33		31
34	INITVERSION= 2013-05-24	32	INITVERSION= 2014-12-24
35	KSHVERSION= 2012-08-01	33	KSHVERSION= 2016-07-16
36		34
37	STATIC_MAKE_ENV= LDFLAGS+=-static	35	STATIC_MAKE_ENV= LDFLAGS+=-static
38		36

Lines 1-20 Link Here

(-)ksh93/files/patch-src-lib-libast-hash-hashalloc.c (-20 lines)
1	--- src/lib/libast/hash/hashalloc.c.orig 2013-12-28 22:09:43.000000000 +0100
2	+++ src/lib/libast/hash/hashalloc.c 2013-12-28 22:43:14.000000000 +0100
3	@@ -49,6 +49,7 @@
4	va_list* vp = va;
5	Hash_region_f region = 0;
6	void* handle;
7	+ va_listarg tmpval;
8
9	va_start(ap, ref);
10
11	@@ -151,7 +152,8 @@
12	va_copy(*vp, ap);
13	vp++;
14	}
15	- va_copy(ap, va_listval(va_arg(ap, va_listarg)));
16	+ tmpval = va_listval(va_arg(ap, va_listarg));
17	+ va_copy(ap, tmpval);
18	break;
19	case 0:
20	if (vp > va)

Lines 1-20 Link Here

(-)ksh93/files/patch-src-lib-libast-string-tokscan.c (-20 lines)
1	--- ./src/lib/libast/string/tokscan.c.orig 2013-12-28 22:16:20.000000000 +0100
2	+++ ./src/lib/libast/string/tokscan.c 2013-12-28 22:43:28.000000000 +0100
3	@@ -188,6 +188,7 @@
4	char** p_string;
5	char* prv_f = 0;
6	va_list prv_ap;
7	+ va_listarg tmpval;
8
9	va_start(ap, fmt);
10	if (!s \|\| s == '\n')
11	@@ -233,7 +234,8 @@
12	prv_f = f;
13	f = va_arg(ap, char*);
14	va_copy(prv_ap, ap);
15	- va_copy(ap, va_listval(va_arg(ap, va_listarg)));
16	+ tmpval = va_listval(va_arg(ap, va_listarg));
17	+ va_copy(ap, tmpval);
18	continue;
19	case 'c':
20	p_char = va_arg(ap, char*);