From de85d850fda6cf247b59070aa5e7873d35e954c3 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Thu, 4 Oct 2007 06:06:19 +0000
Subject: SunOS-5.9 doesn't have stdint.h.  There is already a configure test
 for this so use the results.

---
 devel/libevent/Makefile         |  3 ++-
 devel/libevent/distinfo         |  5 ++++-
 devel/libevent/patches/patch-ab | 24 ++++++++++++++++++++++++
 devel/libevent/patches/patch-ac | 22 ++++++++++++++++++++++
 devel/libevent/patches/patch-ae | 21 +++++++++++++++++++++
 5 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 devel/libevent/patches/patch-ab
 create mode 100644 devel/libevent/patches/patch-ac
 create mode 100644 devel/libevent/patches/patch-ae

(limited to 'devel')

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 8d8e1f837ed..e1b32dcdb10 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/08/16 08:59:43 tnn Exp $
+# $NetBSD: Makefile,v 1.25 2007/10/04 06:06:19 dmcmahill Exp $
 #
 # WARNING: updating this package (as of the 1.1/1.2 releases) means
 # updating BUILDLINK_ABI_DEPENDS in buildlink3.mk and a PKGREVISION
@@ -8,6 +8,7 @@
 # [tvierling 20070210]
 
 DISTNAME=	libevent-1.3d
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 040dafef531..c95d2f95847 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.17 2007/08/16 08:59:46 tnn Exp $
+$NetBSD: distinfo,v 1.18 2007/10/04 06:06:19 dmcmahill Exp $
 
 SHA1 (libevent-1.3d.tar.gz) = 591b3c43652e1b88511d1022b296cf214b37644b
 RMD160 (libevent-1.3d.tar.gz) = 1eae8acefba6d09b4f7f5c99f9469c881dc5426a
 Size (libevent-1.3d.tar.gz) = 441883 bytes
 SHA1 (patch-aa) = 08a7dd87194730b0d3294deee7feb196e22c1b77
+SHA1 (patch-ab) = cbe1cf46818e30dae15b31db4f21038f69b8dcf6
+SHA1 (patch-ac) = 47bbbd25fbd58c15d8dc5fbd824da610f19d8ca4
 SHA1 (patch-ad) = c842811d0b8e3f843a2f363dd2d11ec784fb8264
+SHA1 (patch-ae) = 1175c8fbd19623cb8b2fb9fd9ba2220fb3db90e4
diff --git a/devel/libevent/patches/patch-ab b/devel/libevent/patches/patch-ab
new file mode 100644
index 00000000000..2285916b009
--- /dev/null
+++ b/devel/libevent/patches/patch-ab
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.3 2007/10/04 06:06:19 dmcmahill Exp $
+
+--- event.h.orig	2007-08-02 11:23:05.000000000 -0400
++++ event.h
+@@ -31,8 +31,18 @@
+ extern "C" {
+ #endif
+ 
++#include "config.h"
++
+ #include <sys/time.h>
+-#include <stdint.h>
++
++#ifdef HAVE_STDINT_H
++#  include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#  include <inttypes.h>
++#else
++#  error No inttypes.h or stdint.h to give integer types
++#endif
++
+ #include <stdarg.h>
+ 
+ #ifdef WIN32
diff --git a/devel/libevent/patches/patch-ac b/devel/libevent/patches/patch-ac
new file mode 100644
index 00000000000..96bf315ebac
--- /dev/null
+++ b/devel/libevent/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.3 2007/10/04 06:06:19 dmcmahill Exp $
+
+--- test/regress.gen.h.orig	2007-08-16 00:51:57.000000000 -0400
++++ test/regress.gen.h
+@@ -5,7 +5,16 @@
+ #ifndef _REGRESS_RPC_
+ #define _REGRESS_RPC_
+ 
+-#include <stdint.h>
++#include "config.h"
++
++#ifdef HAVE_STDINT_H
++#  include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#  include <inttypes.h>
++#else
++#  error No inttypes.h or stdint.h to give integer types
++#endif
++
+ #define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)
+ #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->member##_assign)(msg, ## args)
+ #define EVTAG_GET(msg, member, args...) (*(msg)->member##_get)(msg, ## args)
diff --git a/devel/libevent/patches/patch-ae b/devel/libevent/patches/patch-ae
new file mode 100644
index 00000000000..0d49620ac25
--- /dev/null
+++ b/devel/libevent/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2007/10/04 06:06:20 dmcmahill Exp $
+
+--- event_rpcgen.py.orig	2007-08-02 11:23:05.000000000 -0400
++++ event_rpcgen.py
+@@ -1295,8 +1295,14 @@ def HeaderPreamble(name):
+         '#define %s\n\n' ) % (
+         name, guard, guard)
+ 
+-    # insert stdint.h - let's hope everyone has it
+-    pre += '#include <stdint.h>\n'
++    pre += ('#include "config.h"\n'
++            '#ifdef HAVE_STDINT_H\n'
++            '#  include <stdint.h>\n'
++            '#elif defined(HAVE_INTTYPES_H)\n'
++            '#  include <inttypes.h>\n'
++            '#else\n'
++            '#  error No inttypes.h or stdint.h to give integer types\n'
++            '#endif\n' )
+ 
+     for statement in headerdirect:
+         pre += '%s\n' % statement
-- 
cgit v1.2.3