[pkgsrc/trunk]: pkgsrc/devel/libevent SunOS-5.9 doesn't have stdint.h. There...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a25f35321e4
branches:  trunk
changeset: 533861:1a25f35321e4
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Oct 04 06:06:19 2007 +0000

description:
SunOS-5.9 doesn't have stdint.h.  There is already a configure test for this
so use the results.

diffstat:

 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(-)

diffs (111 lines):

diff -r 41e5c7985e22 -r 1a25f35321e4 devel/libevent/Makefile
--- a/devel/libevent/Makefile   Thu Oct 04 05:19:16 2007 +0000
+++ b/devel/libevent/Makefile   Thu Oct 04 06:06:19 2007 +0000
@@ -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 -r 41e5c7985e22 -r 1a25f35321e4 devel/libevent/distinfo
--- a/devel/libevent/distinfo   Thu Oct 04 05:19:16 2007 +0000
+++ b/devel/libevent/distinfo   Thu Oct 04 06:06:19 2007 +0000
@@ -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 -r 41e5c7985e22 -r 1a25f35321e4 devel/libevent/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libevent/patches/patch-ab   Thu Oct 04 06:06:19 2007 +0000
@@ -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 -r 41e5c7985e22 -r 1a25f35321e4 devel/libevent/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libevent/patches/patch-ac   Thu Oct 04 06:06:19 2007 +0000
@@ -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 -r 41e5c7985e22 -r 1a25f35321e4 devel/libevent/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libevent/patches/patch-ae   Thu Oct 04 06:06:19 2007 +0000
@@ -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