Fri Dec 5 14:06:28 2014 UTC ()
Detect libevent-2.0.21 in netbsd-7 and -current


(pettai)
diff -r1.12 -r1.13 pkgsrc/devel/libevent/builtin.mk
cvs diff -r1.12 -r1.13 pkgsrc/devel/libevent/builtin.mk (expand / switch to unified diff)

--- pkgsrc/devel/libevent/builtin.mk 2013/11/23 11:29:35 1.12
+++ pkgsrc/devel/libevent/builtin.mk 2014/12/05 14:06:28 1.13
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: builtin.mk,v 1.12 2013/11/23 11:29:35 obache Exp $ 1# $NetBSD: builtin.mk,v 1.13 2014/12/05 14:06:28 pettai Exp $
2 2
3BUILTIN_PKG:= libevent 3BUILTIN_PKG:= libevent
4 4
5BUILTIN_FIND_HEADERS_VAR:= H_LIBEVENT H_LIBEVENTCONFIG 5BUILTIN_FIND_HEADERS_VAR:= H_LIBEVENT H_LIBEVENTCONFIG
6BUILTIN_FIND_HEADERS.H_LIBEVENT= event.h 6BUILTIN_FIND_HEADERS.H_LIBEVENT= event.h
7BUILTIN_FIND_HEADERS.H_LIBEVENTCONFIG= event-config.h 7BUILTIN_FIND_HEADERS.H_LIBEVENTCONFIG= event-config.h event2/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###
15.if !defined(IS_BUILTIN.libevent) 15.if !defined(IS_BUILTIN.libevent)
16IS_BUILTIN.libevent= no 16IS_BUILTIN.libevent= no
17. if empty(H_LIBEVENT:M__nonexistent__) && empty(H_LIBEVENT:M${LOCALBASE}/*) 17. if empty(H_LIBEVENT:M__nonexistent__) && empty(H_LIBEVENT:M${LOCALBASE}/*)
18IS_BUILTIN.libevent= yes 18IS_BUILTIN.libevent= yes
19. endif 19. endif
20.endif # IS_BUILTIN.libevent 20.endif # IS_BUILTIN.libevent
@@ -22,27 +22,31 @@ MAKEVARS+= IS_BUILTIN.libevent @@ -22,27 +22,31 @@ MAKEVARS+= 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_BLTN_EVENT_1_4_12!= \ 33_BLTN_EVENT_1_4_12!= \
34 ${GREP} -c 1.4.12-stable ${H_LIBEVENTCONFIG} || ${TRUE} 34 ${GREP} -c 1.4.12-stable ${H_LIBEVENTCONFIG} || ${TRUE}
35. if ${_BLTN_EVENT_1_4_12} == "1" 35_BLTN_EVENT_2_0_21!= \
 36 ${GREP} -c 2.0.21-stable ${H_LIBEVENTCONFIG} || ${TRUE}
 37. if ${_BLTN_EVENT_2_0_21} == "1"
 38BUILTIN_VERSION.libevent= 2.0.21
 39. elif ${_BLTN_EVENT_1_4_12} == "1"
36BUILTIN_VERSION.libevent= 1.4.12 40BUILTIN_VERSION.libevent= 1.4.12
37. elif ${_BLTN_EVENT_1_4_11} == "1" 41. elif ${_BLTN_EVENT_1_4_11} == "1"
38BUILTIN_VERSION.libevent= 1.4.11 42BUILTIN_VERSION.libevent= 1.4.11
39. else 43. else
40BUILTIN_VERSION.libevent= 1.4.4 44BUILTIN_VERSION.libevent= 1.4.4
41. endif 45. endif
42. else 46. else
43# libevent>=1.3: bufferevent_base_set added 47# libevent>=1.3: bufferevent_base_set added
44_BLTN_EVENT_13!= \ 48_BLTN_EVENT_13!= \
45 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE} 49 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE}
46# libevent>=1.2: evtag_*, event_base_free added 50# libevent>=1.2: evtag_*, event_base_free added
47_BLTN_EVENT_12!= \ 51_BLTN_EVENT_12!= \
48 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE} 52 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE}