Fix crash on amd64 and probably other 64 bit archs, bump PKGREVISION

5 files changed, 23 insertions, 7 deletions

diff --git a/emulators/ski/DESCR b/emulators/ski/DESCR
index 2fdfea786e3..a2272408e82 100644
--- a/emulators/ski/DESCR
+++ b/emulators/ski/DESCR
@@ -1,6 +1,6 @@
 The Hewlett-Packard IA-64 instruction set simulator
 
-To get the ski to run on NetBSD/i386, you need the following:
+To get the ski to run on NetBSD, you need the following:
 
 procfs support in the kernel:
 	http://www.netbsd.org/docs/guide/en/chap-linux.html#chap-linux-emulating-procfs
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index 41d1f7c159b..e81c71acef7 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2019/11/03 19:24:34 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/17 23:05:19 scole Exp $
 #
 
 DISTNAME=	ski-1.3.2
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ski/}
 
diff --git a/emulators/ski/distinfo b/emulators/ski/distinfo
index e626485dcbd..207d772090c 100644
--- a/emulators/ski/distinfo
+++ b/emulators/ski/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2016/08/14 18:27:05 scole Exp $
+$NetBSD: distinfo,v 1.7 2019/11/17 23:05:19 scole Exp $
 
 SHA1 (ski-1.3.2.tar.gz) = fc067041a70cf45cad6af42da7ffe5bf100d7c65
 RMD160 (ski-1.3.2.tar.gz) = 1ff739eac7b8163026d208ee9b51d134f524e73f
@@ -18,12 +18,13 @@ SHA1 (patch-aj) = c2ac0b850381d2fee3b3f7846cf3aeb51d8e8245
 SHA1 (patch-ak) = 0abaa09fb172ebbc8715908f5c6f49936b22aefa
 SHA1 (patch-al) = 1911d6c8e051ab2b64055cf1c64856188268619e
 SHA1 (patch-am) = 0965936933424ab4af4d1fa3384808f4e92f9b04
-SHA1 (patch-an) = 72f18e509d371e4724a35b4be195a21dbcdac859
+SHA1 (patch-an) = 806e93b03b5c5af8570af968706f73609484b578
 SHA1 (patch-ao) = 8f2eabd4d8dc6ccef593a5f50d00485a905ee523
 SHA1 (patch-ap) = a98cd0aa55a002020c26fb70e5549bd16270bf39
 SHA1 (patch-src-line_separator.h) = 2c9b0c2fdace6bc59735cbeb9588aea21b19b1db
 SHA1 (patch-src_eparse.y) = c82918d36047e51273cc1aa0e20a4ce1649668f5
 SHA1 (patch-src_freebsd_signal.h) = 265bd4e3f18dcfda791595b1356b37398c055349
+SHA1 (patch-src_freebsd_ssc.c) = f18af96206f0dc6e065b461634f9e26067ef2855
 SHA1 (patch-src_program.c) = d364a8a0ababfbc48333d5e48962f53677bcfeb9
 SHA1 (patch-src_ssDCmd.c) = 9062b2107f72171644e27d83ec45260aa40019fe
 SHA1 (patch-src_ssX.c) = 01c24b8d6b62b51798ae4a33e69cfb323a66f8d5
diff --git a/emulators/ski/patches/patch-an b/emulators/ski/patches/patch-an
index 1bb600a706e..19a36bb5dac 100644
--- a/emulators/ski/patches/patch-an
+++ b/emulators/ski/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2016/08/14 18:27:05 scole Exp $
+$NetBSD: patch-an,v 1.3 2019/11/17 23:05:19 scole Exp $
 
 --- src/netbsd/ssc-netbsd.c.orig	2010-11-04 05:01:51.000000000 +0000
 +++ src/netbsd/ssc-netbsd.c	2016-05-06 14:44:42.000000000 -0400
@@ -133,7 +133,7 @@ $NetBSD: patch-an,v 1.2 2016/08/14 18:27:05 scole Exp $
 +
 +		sprintf(tty, "-S%s/%d", name, slave); 
 +		execlp("xterm", "xterm", tty, "-geo", "80x24", "-name",
-+		    "xski console", 0);
++		    "xski console", (char *)NULL);
 +		perror("execlp(\"xterm\", ...) failed.");
 +		abort();
 +
diff --git a/emulators/ski/patches/patch-src_freebsd_ssc.c b/emulators/ski/patches/patch-src_freebsd_ssc.c
new file mode 100644
index 00000000000..7a81d41d1e4
--- /dev/null
+++ b/emulators/ski/patches/patch-src_freebsd_ssc.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_freebsd_ssc.c,v 1.1 2019/11/17 23:05:20 scole Exp $
+
+Cast argument to execlp() appropriately
+
+--- src/freebsd/ssc.c.orig	2008-02-04 20:11:38.000000000 -0800
++++ src/freebsd/ssc.c	2019-11-11 08:49:35.285330731 -0800
+@@ -128,7 +128,7 @@
+ 		tty = name + namelen + 1;
+ 		sprintf(tty, "-S%s%d", name + namelen - 2, master);
+ 		execlp("xterm", "xterm", tty, "-geo", "80x24", "-name",
+-		    "xski console", 0);
++		    "xski console", (char *)NULL);
+ 		abort();
+ 	default: /* parent */
+ 		close(master);