From 113c511ec0d09631b201e08de093060576a8823d Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 29 Apr 2013 21:23:24 +0000
Subject: Avoid hash function name since C++11 already provides such functions.

---
 mail/xfmail/distinfo                         |  3 ++-
 mail/xfmail/patches/patch-src_mail_fmail.cpp | 38 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 mail/xfmail/patches/patch-src_mail_fmail.cpp

(limited to 'mail')

diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo
index 3715cf30e97..fc558387275 100644
--- a/mail/xfmail/distinfo
+++ b/mail/xfmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/12/05 22:49:46 joerg Exp $
+$NetBSD: distinfo,v 1.12 2013/04/29 21:23:24 joerg Exp $
 
 SHA1 (xfmail-1.5.5.tar.bz2) = 7a98486d1f8cce956efaf37d9540369d5f327401
 RMD160 (xfmail-1.5.5.tar.bz2) = bf3e866d6fa37b7b9959c532b1f4b82fb57eb307
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = ca52f1038f190a310d7d3d5f1dece187a2958ce8
 SHA1 (patch-ac) = f04aad8c7d44183cf16743c31c1779b42da500a1
 SHA1 (patch-ad) = 91d92fb76b5ecf9c07295b942a34628ce212ae3d
 SHA1 (patch-ae) = 8d1d16f62511b78fc20c47e78eebc83dd8feac8d
+SHA1 (patch-src_mail_fmail.cpp) = c9e476c93c3ec1a94cb284fa4c5c662c15060729
diff --git a/mail/xfmail/patches/patch-src_mail_fmail.cpp b/mail/xfmail/patches/patch-src_mail_fmail.cpp
new file mode 100644
index 00000000000..fda8a71afd3
--- /dev/null
+++ b/mail/xfmail/patches/patch-src_mail_fmail.cpp
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_mail_fmail.cpp,v 1.1 2013/04/29 21:23:24 joerg Exp $
+
+--- src/mail/fmail.cpp.orig	2013-04-29 19:31:08.000000000 +0000
++++ src/mail/fmail.cpp
+@@ -1686,7 +1686,7 @@ compare_msgs(struct _mail_msg **msg1, st
+ }
+ 
+ unsigned long
+-hash(const char *name) {
++my_hash(const char *name) {
+ 	unsigned long key = 0;
+ 	unsigned char c;
+ 
+@@ -1791,7 +1791,7 @@ sort_folder(struct _mail_folder *folder)
+ 
+ 			if(m_id &&
+ 			   ((s = strchr(m_id->f_line,'<')) != NULL)) {
+-				unsigned long key = hash(s) % htsize;
++				unsigned long key = my_hash(s) % htsize;
+ 				make_entry(ht, key, htsize, s, msg);
+ 			}
+ 			msg->ref = NULL;
+@@ -1808,13 +1808,13 @@ sort_folder(struct _mail_folder *folder)
+ 			ref=NULL;
+ 			m_id = find_field(msg,"In-Reply-To");
+ 			if(m_id && (s=strrchr(m_id->f_line,'<'))) {
+-				key = hash(s) % htsize;
++				key = my_hash(s) % htsize;
+ 				ref = find_entry(ht, key, htsize, s);
+ 			}
+ 			if(!ref) {
+ 				m_id=find_field(msg,"References");
+ 				if(m_id && (s=strrchr(m_id->f_line,'<'))) {
+-					key = hash(s) % htsize;
++					key = my_hash(s) % htsize;
+ 					ref = find_entry(ht, key, htsize, s);
+ 				}
+ 			}
-- 
cgit v1.2.3