summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-03-17 14:37:47 +0000
committerrillig <rillig@pkgsrc.org>2007-03-17 14:37:47 +0000
commita3712e8d897c8bfa36d50250e72454ab1aa344ed (patch)
treec78571eb4d6f61ec589eb25cdab20c244c9e7986 /chat
parent82f2407ae2c317dde5bb92c37ce3db4b9d3d8ea3 (diff)
downloadpkgsrc-a3712e8d897c8bfa36d50250e72454ab1aa344ed.tar.gz
Fixed the build with gcc4.
Diffstat (limited to 'chat')
-rw-r--r--chat/zephyr/distinfo4
-rw-r--r--chat/zephyr/patches/patch-ae21
2 files changed, 20 insertions, 5 deletions
diff --git a/chat/zephyr/distinfo b/chat/zephyr/distinfo
index fa3c6026aa8..e5fb599c975 100644
--- a/chat/zephyr/distinfo
+++ b/chat/zephyr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/06/04 13:42:10 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/03/17 14:37:47 rillig Exp $
SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c
RMD160 (zephyr-20010518.tar.gz) = 1082db0df40e4ac1007e4b2b4f8adc15cf8a8ab0
@@ -6,7 +6,7 @@ Size (zephyr-20010518.tar.gz) = 342259 bytes
SHA1 (patch-aa) = f4338f0da9085e1780c52c9b2be2366b7a0f22c2
SHA1 (patch-ab) = 61cbadf511806c1c16e489ac6d14de347b09277a
SHA1 (patch-ad) = b0f8c408afc2e7fe9a673a5f2ec562a3e34e225c
-SHA1 (patch-ae) = 76b4a43282f3d8d8d42d72f66c677a652ff33e22
+SHA1 (patch-ae) = e0d0776b891db5b8542285899e22c886337cc6c7
SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c
SHA1 (patch-ag) = 2c756da1e62613333cca2b68ca9b5f6c96e0f147
SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207
diff --git a/chat/zephyr/patches/patch-ae b/chat/zephyr/patches/patch-ae
index e1310002061..20d59bfc4ba 100644
--- a/chat/zephyr/patches/patch-ae
+++ b/chat/zephyr/patches/patch-ae
@@ -1,7 +1,22 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/09/16 19:41:50 seb Exp $
+$NetBSD: patch-ae,v 1.2 2007/03/17 14:37:47 rillig Exp $
---- server/kopt.c.orig Mon Feb 26 23:48:01 2001
-+++ server/kopt.c
+gcc4 complains:
+kopt.c:34: error: static declaration of 'krbONE' follows non-static declaration
+.../.buildlink/include/kerberosIV/krb.h:64: error: previous declaration of 'krbONE' was here
+
+--- server/kopt.c.orig 2001-02-27 05:48:01.000000000 +0100
++++ server/kopt.c 2007-03-17 15:34:42.000000000 +0100
+@@ -31,8 +31,8 @@ static const char *rcsid_rd_req_c =
+
+ /* Byte ordering */
+ #undef HOST_BYTE_ORDER
+-static int krbONE = 1;
+-#define HOST_BYTE_ORDER (* (char *) &krbONE)
++static int my_krbONE = 1;
++#define HOST_BYTE_ORDER (* (char *) &my_krbONE)
+
+ #define KRB_PROT_VERSION 4
+
@@ -161,7 +161,7 @@ void add_to_key_sched_cache(key, sched)
int