From 3ec3f0873a46396349202d89d6942c01b14c1c18 Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill>
Date: Thu, 4 Oct 2007 12:28:13 +0000
Subject: One more try.  event.h gets installed and used by other programs so
 we can't use config.h in it.  Instead use the substitution framework which
 was already in place for making some other SunOS changes.

---
 devel/libevent/Makefile         |  7 ++++---
 devel/libevent/distinfo         |  3 +--
 devel/libevent/patches/patch-ab | 24 ------------------------
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 devel/libevent/patches/patch-ab

(limited to 'devel')

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index e1b32dcdb10..e2c3564bd4f 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/10/04 06:06:19 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.26 2007/10/04 12:28:13 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,7 +8,7 @@
 # [tvierling 20070210]
 
 DISTNAME=	libevent-1.3d
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
@@ -37,7 +37,8 @@ CFLAGS+=	-Du_int32_t=uint32_t
 SUBST_CLASSES+=		inttypes
 SUBST_STAGE.inttypes=	post-patch
 SUBST_FILES.inttypes=	event.h
-SUBST_SED.inttypes=	-e "s,u_int8_t,uint8_t,g"
+SUBST_SED.inttypes=	-e "s,<stdint\.h>,<inttypes.h>,g"
+SUBST_SED.inttypes+=	-e "s,u_int8_t,uint8_t,g"
 SUBST_SED.inttypes+=	-e "s,u_int16_t,uint16_t,g"
 SUBST_SED.inttypes+=	-e "s,u_int32_t,uint32_t,g"
 .endif
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index c95d2f95847..94e2d1d27f5 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.18 2007/10/04 06:06:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.19 2007/10/04 12:28:13 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
deleted file mode 100644
index 2285916b009..00000000000
--- a/devel/libevent/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
-- 
cgit v1.2.3