[pkgsrc/trunk]: pkgsrc/security/honeyd Work around macro name conflict with n...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9374df868924
branches:  trunk
changeset: 368014:9374df868924
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Sep 10 01:44:31 2017 +0000

description:
Work around macro name conflict with netbsd's builtin libevent.

The build goes further than before, but fails later trying to do
no-longer-permitted things with libevent's internals.

diffstat:

 security/honeyd/distinfo                |   3 ++-
 security/honeyd/patches/patch-tagging.h |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r d8f4577f4062 -r 9374df868924 security/honeyd/distinfo
--- a/security/honeyd/distinfo  Sun Sep 10 01:01:34 2017 +0000
+++ b/security/honeyd/distinfo  Sun Sep 10 01:44:31 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 01:17:46 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/09/10 01:44:31 dholland Exp $
 
 SHA1 (honeyd-1.5b.tar.gz) = a6cef01ddb0b649442ac60e2a08b226b1634e3f9
 RMD160 (honeyd-1.5b.tar.gz) = 40ebe7d3a2915b5145c5a2eef04b9d1de18fbb09
@@ -6,3 +6,4 @@
 Size (honeyd-1.5b.tar.gz) = 881787 bytes
 SHA1 (patch-aa) = b69d986bd1a5c1847f4f5467216730da020c8686
 SHA1 (patch-ab) = 6f789cae31cc9b38ae68c2d9250dcab67e1a0146
+SHA1 (patch-tagging.h) = 69c19ce9948594010a2db3701453c5ff5d085577
diff -r d8f4577f4062 -r 9374df868924 security/honeyd/patches/patch-tagging.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/honeyd/patches/patch-tagging.h   Sun Sep 10 01:44:31 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-tagging.h,v 1.1 2017/09/10 01:44:32 dholland Exp $
+
+Work around namespace conflict from libevent.
+
+--- tagging.h~ 2006-08-19 07:10:41.000000000 +0000
++++ tagging.h
+@@ -33,6 +33,9 @@
+ #ifndef _TAGGING_
+ #define _TAGGING_
+ 
++/* work around namespace conflict from libevent */
++#undef encode_int
++
+ void tagging_init(void);
+ 
+ #define SHINGLE_MIN   32