summaryrefslogtreecommitdiff
path: root/comms/kermit
diff options
context:
space:
mode:
authorhans <hans>2011-08-25 13:46:28 +0000
committerhans <hans>2011-08-25 13:46:28 +0000
commit01fd90bd113608e8b6504f939c97aec512237363 (patch)
treee68f0f46fb6c050e9debfb2e6ec995632ad2bd9a /comms/kermit
parent166d957137bf9054df8da1101d246fcc1d39c473 (diff)
downloadpkgsrc-01fd90bd113608e8b6504f939c97aec512237363.tar.gz
FILE is a opaque data type on 64bit SunOS, its true definition is not
available in any headers. Hack around this by adding the definition from the Illumos source in the relevant place. Fixes 64bit build.
Diffstat (limited to 'comms/kermit')
-rw-r--r--comms/kermit/distinfo4
-rw-r--r--comms/kermit/patches/patch-ae22
2 files changed, 23 insertions, 3 deletions
diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo
index 2b246facaea..2d17341c882 100644
--- a/comms/kermit/distinfo
+++ b/comms/kermit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2011/05/14 19:27:53 hans Exp $
+$NetBSD: distinfo,v 1.18 2011/08/25 13:46:28 hans Exp $
SHA1 (kermit-8.0.211/cku211.tar.gz) = cd5e0524d27fea0275a0938da2a5fc115e0978b8
RMD160 (kermit-8.0.211/cku211.tar.gz) = c80de6eeec3b4d87a09946a4d440da3b4faaa3b2
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 222e5c3879271f876c9b61d5a51a6825f443b048
SHA1 (patch-ab) = 7e874c4d7d6febe4c6694134879fe0008f6e9c8f
SHA1 (patch-ac) = 01e7ab07fcebd971672488221efa4d987c4ebf3e
SHA1 (patch-ad) = 8f6073b0e68cf3191ffba6d818a87ab3f3095ea4
-SHA1 (patch-ae) = 751ef97b601f3ef408023c2390acfd3ab6c4b532
+SHA1 (patch-ae) = 53384e9cbfe13559d69ab95215a4575f726dc325
SHA1 (patch-af) = 2a09f9f933d3c1e6860983d8138ac61f33306ef7
SHA1 (patch-ag) = 5eff93d977bff114d2d193b6d069264388ebc997
SHA1 (patch-ah) = 5b2098dfd57f8bd4d107acafaabe1a2c9b97d037
diff --git a/comms/kermit/patches/patch-ae b/comms/kermit/patches/patch-ae
index dad5b49f79d..9148914da6d 100644
--- a/comms/kermit/patches/patch-ae
+++ b/comms/kermit/patches/patch-ae
@@ -1,7 +1,27 @@
-$NetBSD: patch-ae,v 1.5 2005/12/18 23:15:43 joerg Exp $
+$NetBSD: patch-ae,v 1.6 2011/08/25 13:46:28 hans Exp $
--- ckucmd.c.orig 2005-12-18 22:57:18.000000000 +0000
+++ ckucmd.c
+@@ -7115,8 +7115,19 @@ cmdconchk() {
+ #ifdef NOARROWKEYS
+ debug(F101,"cmdconchk NOARROWKEYS x","",0);
+ #else
++#if defined(__sun) && (defined(__amd64) || defined(__sparcv9))
++ struct sun_64_FILE {
++ unsigned char *_ptr; /* next character from/to here in buffer */
++ unsigned char *_base; /* the buffer */
++ unsigned char *_end; /* the end of the buffer */
++ ssize_t _cnt; /* number of available characters in buffer */
++ } *sun_64_stdin = (struct sun_64_FILE *)stdin;
++ debug(F101,"cmdconchk sun_64_stdin->_cnt","",sun_64_stdin->_cnt);
++ x = sun_64_stdin->_cnt;
++#else
+ debug(F101,"cmdconchk stdin->_cnt","",stdin->_cnt);
+ x = stdin->_cnt;
++#endif
+ #endif /* NOARROWKEYS */
+ #endif /* VMS */
+ if (x == 0) x = conchk();
@@ -7128,7 +7128,12 @@ cmdconchk() {
if (x == 0) x = conchk();
if (x < 0) x = 0;