Tue Aug 18 17:14:55 2009 UTC ()
recognize builtin libevent-1.4 so that apps can build against it
This way we sidestep the mess introduced by conflicting libev/libevent,
at least on NetBSD>=5.


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

--- pkgsrc/devel/libevent/builtin.mk 2008/04/22 17:16:54 1.7
+++ pkgsrc/devel/libevent/builtin.mk 2009/08/18 17:14:55 1.8
@@ -1,41 +1,45 @@ @@ -1,41 +1,45 @@
1# $NetBSD: builtin.mk,v 1.7 2008/04/22 17:16:54 tnn Exp $ 1# $NetBSD: builtin.mk,v 1.8 2009/08/18 17:14:55 drochner Exp $
2 2
3BUILTIN_PKG:= libevent 3BUILTIN_PKG:= libevent
4 4
5BUILTIN_FIND_FILES_VAR:= H_LIBEVENT 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
7 8
8.include "../../mk/buildlink3/bsd.builtin.mk" 9.include "../../mk/buildlink3/bsd.builtin.mk"
9 10
10### 11###
11### 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
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 13### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 14###
14.if !defined(IS_BUILTIN.libevent) 15.if !defined(IS_BUILTIN.libevent)
15IS_BUILTIN.libevent= no 16IS_BUILTIN.libevent= no
16. if empty(H_LIBEVENT:M__nonexistent__) && empty(H_LIBEVENT:M${LOCALBASE}/*) 17. if empty(H_LIBEVENT:M__nonexistent__) && empty(H_LIBEVENT:M${LOCALBASE}/*)
17IS_BUILTIN.libevent= yes 18IS_BUILTIN.libevent= yes
18. endif 19. endif
19.endif # IS_BUILTIN.libevent 20.endif # IS_BUILTIN.libevent
20MAKEVARS+= IS_BUILTIN.libevent 21MAKEVARS+= IS_BUILTIN.libevent
21 22
22### 23###
23### 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
24### a package name to represent the built-in package. 25### a package name to represent the built-in package.
25### 26###
26.if !defined(BUILTIN_PKG.libevent) && \ 27.if !defined(BUILTIN_PKG.libevent) && \
27 !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) && \ 28 !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) && \
28 empty(H_LIBEVENT:M__nonexistent__) 29 empty(H_LIBEVENT:M__nonexistent__)
 30.if empty(H_LIBEVENTCONFIG:M__nonexistent__)
 31BUILTIN_VERSION.libevent= 1.4.4
 32.else
29# libevent>=1.3: bufferevent_base_set added 33# libevent>=1.3: bufferevent_base_set added
30_BLTN_EVENT_13!= \ 34_BLTN_EVENT_13!= \
31 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE} 35 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE}
32# libevent>=1.2: evtag_*, event_base_free added 36# libevent>=1.2: evtag_*, event_base_free added
33_BLTN_EVENT_12!= \ 37_BLTN_EVENT_12!= \
34 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE} 38 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE}
35# libevent>=1.1b: evbuffer_add_vprintf added 39# libevent>=1.1b: evbuffer_add_vprintf added
36_BLTN_EVENT_11b!= \ 40_BLTN_EVENT_11b!= \
37 ${GREP} -c evbuffer_add_vprintf ${H_LIBEVENT} || ${TRUE} 41 ${GREP} -c evbuffer_add_vprintf ${H_LIBEVENT} || ${TRUE}
38# libevent>=1.0d: evbuffer_readline added 42# libevent>=1.0d: evbuffer_readline added
39_BLTN_EVENT_10d!= \ 43_BLTN_EVENT_10d!= \
40 ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE} 44 ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE}
41# libevent>=1.0c: event_set_log_callback, event_base_loopexit and 45# libevent>=1.0c: event_set_log_callback, event_base_loopexit and
@@ -71,26 +75,27 @@ BUILTIN_VERSION.libevent= 1.0c @@ -71,26 +75,27 @@ BUILTIN_VERSION.libevent= 1.0c
71. elif ${_BLTN_EVENT_10} == "1" 75. elif ${_BLTN_EVENT_10} == "1"
72BUILTIN_VERSION.libevent= 1.0 76BUILTIN_VERSION.libevent= 1.0
73. elif ${_BLTN_EVENT_09} == "1" 77. elif ${_BLTN_EVENT_09} == "1"
74BUILTIN_VERSION.libevent= 0.9 78BUILTIN_VERSION.libevent= 0.9
75. elif ${_BLTN_EVENT_08} == "1" 79. elif ${_BLTN_EVENT_08} == "1"
76BUILTIN_VERSION.libevent= 0.8 80BUILTIN_VERSION.libevent= 0.8
77. elif ${_BLTN_EVENT_07b} == "1" 81. elif ${_BLTN_EVENT_07b} == "1"
78BUILTIN_VERSION.libevent= 0.7b 82BUILTIN_VERSION.libevent= 0.7b
79. elif ${_BLTN_EVENT_06} == "1" 83. elif ${_BLTN_EVENT_06} == "1"
80BUILTIN_VERSION.libevent= 0.6 84BUILTIN_VERSION.libevent= 0.6
81. else 85. else
82BUILTIN_VERSION.libevent= 0.5 86BUILTIN_VERSION.libevent= 0.5
83. endif 87. endif
 88.endif
84BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent} 89BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent}
85.endif 90.endif
86MAKEVARS+= BUILTIN_PKG.libevent 91MAKEVARS+= BUILTIN_PKG.libevent
87 92
88### 93###
89### Determine whether we should use the built-in implementation if it 94### Determine whether we should use the built-in implementation if it
90### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 95### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
91### 96###
92.if !defined(USE_BUILTIN.libevent) 97.if !defined(USE_BUILTIN.libevent)
93. if ${PREFER.libevent} == "pkgsrc" 98. if ${PREFER.libevent} == "pkgsrc"
94USE_BUILTIN.libevent= no 99USE_BUILTIN.libevent= no
95. else 100. else
96USE_BUILTIN.libevent= ${IS_BUILTIN.libevent} 101USE_BUILTIN.libevent= ${IS_BUILTIN.libevent}