Attachment #193586 for bug #211164





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

MAINTAINER=	saper@saper.info
COMMENT=	KornShell 93

LICENSE=	EPL

BROKEN_aarch64=	Fails to link: missing sbrk

OPTIONS_DEFINE=	EXAMPLES STATIC

FETCH_ENV=	HTTP_AUTH=basic:*:I\ accept\ www.opensource.org/licenses/cpl:.
LDFLAGS+=	-lm
MAKE_ENV=	CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses ${CFLAGS}"
NO_WRKSUBDIR=	yes

INITVERSION=	2014-12-24
KSHVERSION=	2018-05-20

STATIC_MAKE_ENV=	LDFLAGS+=-static

BROKEN_aarch64=		Fails to compile: error: unknown type name Dllscan_t

.include <bsd.port.pre.mk>

post-patch:

Lines 1-4 Link Here

(-)ksh93/distinfo (-4 / +5 lines)
1	SHA256 (ksh93/INIT.2013-05-24.tgz) = 118b2c8a4d651727fcd680289be69941d3045951bf9e3a4d45dcb42f0658f014	1	TIMESTAMP = 1526860024
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.2018-05-20.tgz) = f3aa96cc8ffbcbc686cd5dc869160b1585b252daf2f0ebe19bbefa943d82ec7f
		5	SIZE (ksh93/ast-ksh.2018-05-20.tgz) = 2283023

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 07:40:22 UTC
2	+++ src/lib/libast/features/wchar
3	@@ -51,6 +51,7 @@ endif
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	2006-11-07 22:29:04 UTC
+++ src/lib/libast/hash/hashalloc.c
@@ -151,7 +151,16 @@ hashalloc(Hash_table_t* ref, ...)
 				va_copy(*vp, ap);
 				vp++;
 			}
+#if __clang__ && __SIZEOF_POINTER__ == 4
+			{
+				va_list		np;
+
+				np = va_listval(va_arg(ap, va_listarg));
+				va_copy(ap, np);
+			}
+#else
 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
+#endif
 			break;
 		case 0:
 			if (vp > va)




--- src/lib/libast/string/tokscan.c.orig	2006-11-07 22:29:31 UTC
+++ src/lib/libast/string/tokscan.c
@@ -233,7 +233,16 @@ tokscan(register char* s, char** nxt, co
 			prv_f = f;
 			f = va_arg(ap, char*);
 			va_copy(prv_ap, ap);
+#if __clang__ && __SIZEOF_POINTER__ == 4
+			{
+				va_list		np;
+
+				np = va_listval(va_arg(ap, va_listarg));
+				va_copy(ap, np);
+			}
+#else
 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
+#endif
 			continue;
 		case 'c':
 			p_char = va_arg(ap, char*);

Return to bug 211164

Lines 12-43 Link Here

(-)ksh93/Makefile (-10 / +7 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://distfile.net/local-ports-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
22	MAINTAINER= saper@saper.info	20	MAINTAINER= saper@saper.info
23	COMMENT= Official AT&T release of KornShell 93	21	COMMENT= KornShell 93
24		22
25	LICENSE= EPL	23	LICENSE= EPL
26		24
		25	BROKEN_aarch64= Fails to link: missing sbrk
		26
27	OPTIONS_DEFINE= EXAMPLES STATIC	27	OPTIONS_DEFINE= EXAMPLES STATIC
28		28
29	FETCH_ENV= HTTP_AUTH=basic:*:I\ accept\ www.opensource.org/licenses/cpl:.
30	LDFLAGS+= -lm	29	LDFLAGS+= -lm
31	MAKE_ENV= CCFLAGS="${CFLAGS}"	30	MAKE_ENV= CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses ${CFLAGS}"
32	NO_WRKSUBDIR= yes	31	NO_WRKSUBDIR= yes
33		32
34	INITVERSION= 2013-05-24	33	INITVERSION= 2014-12-24
35	KSHVERSION= 2012-08-01	34	KSHVERSION= 2018-05-20
36		35
37	STATIC_MAKE_ENV= LDFLAGS+=-static	36	STATIC_MAKE_ENV= LDFLAGS+=-static
38		37
39	BROKEN_aarch64= Fails to compile: error: unknown type name Dllscan_t
40
41	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
42		39
43	post-patch:	40	post-patch:

Lines 1-19 Link Here

(-)ksh93/files/patch-src-lib-libast-hash-hashalloc.c (-19 lines)
1	--- src/lib/libast/hash/hashalloc.c.orig 2006-11-07 22:29:04 UTC
2	+++ src/lib/libast/hash/hashalloc.c
3	@@ -151,7 +151,16 @@ hashalloc(Hash_table_t* ref, ...)
4	va_copy(*vp, ap);
5	vp++;
6	}
7	+#if __clang__ && __SIZEOF_POINTER__ == 4
8	+ {
9	+ va_list np;
10	+
11	+ np = va_listval(va_arg(ap, va_listarg));
12	+ va_copy(ap, np);
13	+ }
14	+#else
15	va_copy(ap, va_listval(va_arg(ap, va_listarg)));
16	+#endif
17	break;
18	case 0:
19	if (vp > va)

Lines 1-19 Link Here

(-)ksh93/files/patch-src-lib-libast-string-tokscan.c (-19 lines)
1	--- src/lib/libast/string/tokscan.c.orig 2006-11-07 22:29:31 UTC
2	+++ src/lib/libast/string/tokscan.c
3	@@ -233,7 +233,16 @@ tokscan(register char* s, char** nxt, co
4	prv_f = f;
5	f = va_arg(ap, char*);
6	va_copy(prv_ap, ap);
7	+#if __clang__ && __SIZEOF_POINTER__ == 4
8	+ {
9	+ va_list np;
10	+
11	+ np = va_listval(va_arg(ap, va_listarg));
12	+ va_copy(ap, np);
13	+ }
14	+#else
15	va_copy(ap, va_listval(va_arg(ap, va_listarg)));
16	+#endif
17	continue;
18	case 'c':
19	p_char = va_arg(ap, char*);