improvements to last:

- configure script already has provision for different compiler inline
  directives, just not every file was using it.
- u_intXX_t types need to be fixed in installed event.h too.

5 files changed, 38 insertions, 32 deletions

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 901348eac09..110eb49f532 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/02/27 10:38:45 grant Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/27 11:11:17 grant Exp $
 #
 # WARNING: updating this package (as of the 1.1/1.2 releases) means
 # updating BUILDLINK_ABI_DEPENDS in buildlink3.mk and a PKGREVISION
@@ -27,11 +27,14 @@ CFLAGS.SunOS+=	-Du_int8_t=uint8_t
 CFLAGS.SunOS+=	-Du_int16_t=uint16_t
 CFLAGS.SunOS+=	-Du_int32_t=uint32_t
 
-# The SunPro compiler doesn't understand __inline.
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Msunpro)
-CFLAGS.SunOS+=	-D__inline=inline
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS"
+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,u_int16_t,uint16_t,g"
+SUBST_SED.inttypes+=	-e "s,u_int32_t,uint32_t,g"
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 64949aa01a0..978948e8f64 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2007/02/27 10:38:45 grant Exp $
+$NetBSD: distinfo,v 1.14 2007/02/27 11:11:17 grant Exp $
 
 SHA1 (libevent-1.2a.tar.gz) = 904724e029bfea42affc6e73630becd1ba30c217
 RMD160 (libevent-1.2a.tar.gz) = 5790bee3f198d7fac9e74dfac1c025441229ead9
 Size (libevent-1.2a.tar.gz) = 410346 bytes
-SHA1 (patch-aa) = ed170a74ee2f73c6b3894ff3801f8601167702ac
+SHA1 (patch-ab) = 95e52acf92cc1d16a9a585ab9548059ccf5179a3
+SHA1 (patch-ac) = a0ac74f38f2fddefddd87f7b37f266905850133f
diff --git a/devel/libevent/patches/patch-aa b/devel/libevent/patches/patch-aa
deleted file mode 100644
index da668db18f4..00000000000
--- a/devel/libevent/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/02/27 10:38:45 grant Exp $
-
---- Makefile.in.orig	2006-11-29 13:26:12.000000000 +1100
-+++ Makefile.in
-@@ -117,8 +117,8 @@ EXTRA_DIST = acconfig.h event.h event-in
- 
- lib_LTLIBRARIES = libevent.la
- 
--@BUILD_WIN32_TRUE@SUBDIRS = . sample
--@BUILD_WIN32_FALSE@SUBDIRS = . sample test
-+@BUILD_WIN32_TRUE@SUBDIRS = .
-+@BUILD_WIN32_FALSE@SUBDIRS = .
- @BUILD_WIN32_TRUE@SYS_LIBS = -lws2_32
- @BUILD_WIN32_FALSE@SYS_LIBS = 
- @BUILD_WIN32_TRUE@SYS_SRC = WIN32-Code/misc.c WIN32-Code/win32.c
-@@ -187,7 +187,7 @@ DIST_COMMON = README $(include_HEADERS) 
- 	configure configure.in devpoll.c epoll.c epoll_sub.c evport.c \
- 	install-sh kqueue.c ltmain.sh missing mkinstalldirs poll.c \
- 	rtsig.c select.c signal.c strlcpy.c
--DIST_SUBDIRS = . sample test
-+DIST_SUBDIRS = . test
- SOURCES = $(libevent_la_SOURCES)
- 
- all: config.h
diff --git a/devel/libevent/patches/patch-ab b/devel/libevent/patches/patch-ab
new file mode 100644
index 00000000000..46c838d2d12
--- /dev/null
+++ b/devel/libevent/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/02/27 11:11:18 grant Exp $
+
+--- http.c.orig	2006-12-03 08:30:04.000000000 +1100
++++ http.c
+@@ -1337,7 +1337,7 @@ evhttp_send_error(struct evhttp_request 
+ 
+ /* Requires that headers and response code are already set up */
+ 
+-static __inline void
++static inline void
+ evhttp_send(struct evhttp_request *req, struct evbuffer *databuf)
+ {
+ 	struct evhttp_connection *evcon = req->evcon;
diff --git a/devel/libevent/patches/patch-ac b/devel/libevent/patches/patch-ac
new file mode 100644
index 00000000000..d8fab802a23
--- /dev/null
+++ b/devel/libevent/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/02/27 11:11:18 grant Exp $
+
+--- event_tagging.c.orig	2006-11-29 13:15:37.000000000 +1100
++++ event_tagging.c
+@@ -149,7 +149,7 @@ evtag_marshal_timeval(struct evbuffer *e
+ 	    EVBUFFER_LENGTH(_buf));
+ }
+ 
+-static int __inline
++static int inline
+ decode_int_internal(u_int32_t *pnumber, struct evbuffer *evbuf, int dodrain)
+ {
+ 	u_int32_t number = 0;