Fri Nov 13 17:31:07 2009 UTC ()
recognize builtin libevent-1.4.12 (as in NetBSD-current)


(drochner)
diff -r1.9 -r1.10 pkgsrc/devel/libevent/builtin.mk
cvs diff -r1.9 -r1.10 pkgsrc/devel/libevent/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/libevent/builtin.mk 2009/10/27 21:02:26 1.9
+++ pkgsrc/devel/libevent/builtin.mk 2009/11/13 17:31:07 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.9 2009/10/27 21:02:26 drochner Exp $ 1# $NetBSD: builtin.mk,v 1.10 2009/11/13 17:31:07 drochner Exp $
2 2
3BUILTIN_PKG:= libevent 3BUILTIN_PKG:= libevent
4 4
5BUILTIN_FIND_FILES_VAR:= H_LIBEVENT H_LIBEVENTCONFIG 5BUILTIN_FIND_FILES_VAR:= H_LIBEVENT H_LIBEVENTCONFIG
6BUILTIN_FIND_FILES.H_LIBEVENT= /usr/include/event.h 6BUILTIN_FIND_FILES.H_LIBEVENT= /usr/include/event.h
7BUILTIN_FIND_FILES.H_LIBEVENTCONFIG= /usr/include/event-config.h 7BUILTIN_FIND_FILES.H_LIBEVENTCONFIG= /usr/include/event-config.h
8 8
9.include "../../mk/buildlink3/bsd.builtin.mk" 9.include "../../mk/buildlink3/bsd.builtin.mk"
10 10
11### 11###
12### Determine if there is a built-in implementation of the package and 12### Determine if there is a built-in implementation of the package and
13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
14### 14###
@@ -20,27 +20,31 @@ IS_BUILTIN.libevent= yes @@ -20,27 +20,31 @@ IS_BUILTIN.libevent= yes
20.endif # IS_BUILTIN.libevent 20.endif # IS_BUILTIN.libevent
21MAKEVARS+= IS_BUILTIN.libevent 21MAKEVARS+= IS_BUILTIN.libevent
22 22
23### 23###
24### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to 24### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
25### a package name to represent the built-in package. 25### a package name to represent the built-in package.
26### 26###
27.if !defined(BUILTIN_PKG.libevent) && \ 27.if !defined(BUILTIN_PKG.libevent) && \
28 !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) && \ 28 !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) && \
29 empty(H_LIBEVENT:M__nonexistent__) 29 empty(H_LIBEVENT:M__nonexistent__)
30.if empty(H_LIBEVENTCONFIG:M__nonexistent__) 30.if empty(H_LIBEVENTCONFIG:M__nonexistent__)
31_BLTN_EVENT_1_4_11!= \ 31_BLTN_EVENT_1_4_11!= \
32 ${GREP} -c 1.4.11-stable ${H_LIBEVENTCONFIG} || ${TRUE} 32 ${GREP} -c 1.4.11-stable ${H_LIBEVENTCONFIG} || ${TRUE}
33. if ${_BLTN_EVENT_1_4_11} == "1" 33_BLTN_EVENT_1_4_12!= \
 34 ${GREP} -c 1.4.12-stable ${H_LIBEVENTCONFIG} || ${TRUE}
 35. if ${_BLTN_EVENT_1_4_12} == "1"
 36BUILTIN_VERSION.libevent= 1.4.12
 37. elif ${_BLTN_EVENT_1_4_11} == "1"
34BUILTIN_VERSION.libevent= 1.4.11 38BUILTIN_VERSION.libevent= 1.4.11
35. else 39. else
36BUILTIN_VERSION.libevent= 1.4.4 40BUILTIN_VERSION.libevent= 1.4.4
37. endif 41. endif
38.else 42.else
39# libevent>=1.3: bufferevent_base_set added 43# libevent>=1.3: bufferevent_base_set added
40_BLTN_EVENT_13!= \ 44_BLTN_EVENT_13!= \
41 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE} 45 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE}
42# libevent>=1.2: evtag_*, event_base_free added 46# libevent>=1.2: evtag_*, event_base_free added
43_BLTN_EVENT_12!= \ 47_BLTN_EVENT_12!= \
44 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE} 48 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE}
45# libevent>=1.1b: evbuffer_add_vprintf added 49# libevent>=1.1b: evbuffer_add_vprintf added
46_BLTN_EVENT_11b!= \ 50_BLTN_EVENT_11b!= \