Wed Feb 4 23:44:34 2015 UTC ()
Improve STEP_MSG.
(pkgsrc may seem like magic sometimes, but let's be honest here.)


(tnn)
diff -r1.15 -r1.16 pkgsrc/devel/libevent/builtin.mk
diff -r1.3 -r1.4 pkgsrc/devel/libusb/builtin.mk
diff -r1.1 -r1.2 pkgsrc/devel/libusb1/builtin.mk
diff -r1.17 -r1.18 pkgsrc/mk/fuse.buildlink3.mk
diff -r1.18 -r1.19 pkgsrc/textproc/expat/builtin.mk

cvs diff -r1.15 -r1.16 pkgsrc/devel/libevent/builtin.mk (switch to unified diff)

--- pkgsrc/devel/libevent/builtin.mk 2014/12/11 08:10:50 1.15
+++ pkgsrc/devel/libevent/builtin.mk 2015/02/04 23:44:34 1.16
@@ -1,164 +1,164 @@ @@ -1,164 +1,164 @@
1# $NetBSD: builtin.mk,v 1.15 2014/12/11 08:10:50 obache Exp $ 1# $NetBSD: builtin.mk,v 1.16 2015/02/04 23:44:34 tnn 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 event2/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
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_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_BLTN_EVENT_2_0_21!= \ 35_BLTN_EVENT_2_0_21!= \
36 ${GREP} -c 2.0.21-stable ${H_LIBEVENTCONFIG} || ${TRUE} 36 ${GREP} -c 2.0.21-stable ${H_LIBEVENTCONFIG} || ${TRUE}
37. if ${_BLTN_EVENT_2_0_21} == "1" 37. if ${_BLTN_EVENT_2_0_21} == "1"
38BUILTIN_VERSION.libevent= 2.0.21 38BUILTIN_VERSION.libevent= 2.0.21
39. elif ${_BLTN_EVENT_1_4_12} == "1" 39. elif ${_BLTN_EVENT_1_4_12} == "1"
40BUILTIN_VERSION.libevent= 1.4.12 40BUILTIN_VERSION.libevent= 1.4.12
41. elif ${_BLTN_EVENT_1_4_11} == "1" 41. elif ${_BLTN_EVENT_1_4_11} == "1"
42BUILTIN_VERSION.libevent= 1.4.11 42BUILTIN_VERSION.libevent= 1.4.11
43. else 43. else
44BUILTIN_VERSION.libevent= 1.4.4 44BUILTIN_VERSION.libevent= 1.4.4
45. endif 45. endif
46. else 46. else
47# libevent>=1.3: bufferevent_base_set added 47# libevent>=1.3: bufferevent_base_set added
48_BLTN_EVENT_13!= \ 48_BLTN_EVENT_13!= \
49 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE} 49 ${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE}
50# libevent>=1.2: evtag_*, event_base_free added 50# libevent>=1.2: evtag_*, event_base_free added
51_BLTN_EVENT_12!= \ 51_BLTN_EVENT_12!= \
52 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE} 52 ${GREP} -c evtag_ ${H_LIBEVENT} || ${TRUE}
53# libevent>=1.1b: evbuffer_add_vprintf added 53# libevent>=1.1b: evbuffer_add_vprintf added
54_BLTN_EVENT_11b!= \ 54_BLTN_EVENT_11b!= \
55 ${GREP} -c evbuffer_add_vprintf ${H_LIBEVENT} || ${TRUE} 55 ${GREP} -c evbuffer_add_vprintf ${H_LIBEVENT} || ${TRUE}
56# libevent>=1.0d: evbuffer_readline added 56# libevent>=1.0d: evbuffer_readline added
57_BLTN_EVENT_10d!= \ 57_BLTN_EVENT_10d!= \
58 ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE} 58 ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE}
59# libevent>=1.0c: event_set_log_callback, event_base_loopexit and 59# libevent>=1.0c: event_set_log_callback, event_base_loopexit and
60# event_get_{version,method} added 60# event_get_{version,method} added
61_BLTN_EVENT_10c!= \ 61_BLTN_EVENT_10c!= \
62 ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE} 62 ${GREP} -c event_base_loopexit ${H_LIBEVENT} || ${TRUE}
63# libevent>=1.0: event_base_* and event_priority_* added 63# libevent>=1.0: event_base_* and event_priority_* added
64_BLTN_EVENT_10!= \ 64_BLTN_EVENT_10!= \
65 ${GREP} -c event_base_ ${H_LIBEVENT} || ${TRUE} 65 ${GREP} -c event_base_ ${H_LIBEVENT} || ${TRUE}
66# libevent>=0.9: evbuffer_{expand,remove} added 66# libevent>=0.9: evbuffer_{expand,remove} added
67_BLTN_EVENT_09!= \ 67_BLTN_EVENT_09!= \
68 ${GREP} -c evbuffer_expand ${H_LIBEVENT} || ${TRUE} 68 ${GREP} -c evbuffer_expand ${H_LIBEVENT} || ${TRUE}
69# libevent>=0.8: buffering functions added 69# libevent>=0.8: buffering functions added
70_BLTN_EVENT_08!= \ 70_BLTN_EVENT_08!= \
71 ${GREP} -c evbuffer ${H_LIBEVENT} || ${TRUE} 71 ${GREP} -c evbuffer ${H_LIBEVENT} || ${TRUE}
72# libevent>=0.7b: WIN32 support added 72# libevent>=0.7b: WIN32 support added
73_BLTN_EVENT_07b!= \ 73_BLTN_EVENT_07b!= \
74 ${GREP} -c WIN32 ${H_LIBEVENT} || ${TRUE} 74 ${GREP} -c WIN32 ${H_LIBEVENT} || ${TRUE}
75# libevent>=0.6: evtimer_* added 75# libevent>=0.6: evtimer_* added
76_BLTN_EVENT_06!= \ 76_BLTN_EVENT_06!= \
77 ${GREP} -c evtimer_ ${H_LIBEVENT} || ${TRUE} 77 ${GREP} -c evtimer_ ${H_LIBEVENT} || ${TRUE}
78 78
79. if ${_BLTN_EVENT_13} == "1" 79. if ${_BLTN_EVENT_13} == "1"
80BUILTIN_VERSION.libevent= 1.3 80BUILTIN_VERSION.libevent= 1.3
81. elif ${_BLTN_EVENT_12} == "1" 81. elif ${_BLTN_EVENT_12} == "1"
82BUILTIN_VERSION.libevent= 1.2 82BUILTIN_VERSION.libevent= 1.2
83. elif ${_BLTN_EVENT_11b} == "1" 83. elif ${_BLTN_EVENT_11b} == "1"
84BUILTIN_VERSION.libevent= 1.1b 84BUILTIN_VERSION.libevent= 1.1b
85. elif ${_BLTN_EVENT_10d} == "1" 85. elif ${_BLTN_EVENT_10d} == "1"
86BUILTIN_VERSION.libevent= 1.0d 86BUILTIN_VERSION.libevent= 1.0d
87. elif ${_BLTN_EVENT_10c} == "1" 87. elif ${_BLTN_EVENT_10c} == "1"
88BUILTIN_VERSION.libevent= 1.0c 88BUILTIN_VERSION.libevent= 1.0c
89. elif ${_BLTN_EVENT_10} == "1" 89. elif ${_BLTN_EVENT_10} == "1"
90BUILTIN_VERSION.libevent= 1.0 90BUILTIN_VERSION.libevent= 1.0
91. elif ${_BLTN_EVENT_09} == "1" 91. elif ${_BLTN_EVENT_09} == "1"
92BUILTIN_VERSION.libevent= 0.9 92BUILTIN_VERSION.libevent= 0.9
93. elif ${_BLTN_EVENT_08} == "1" 93. elif ${_BLTN_EVENT_08} == "1"
94BUILTIN_VERSION.libevent= 0.8 94BUILTIN_VERSION.libevent= 0.8
95. elif ${_BLTN_EVENT_07b} == "1" 95. elif ${_BLTN_EVENT_07b} == "1"
96BUILTIN_VERSION.libevent= 0.7b 96BUILTIN_VERSION.libevent= 0.7b
97. elif ${_BLTN_EVENT_06} == "1" 97. elif ${_BLTN_EVENT_06} == "1"
98BUILTIN_VERSION.libevent= 0.6 98BUILTIN_VERSION.libevent= 0.6
99. else 99. else
100BUILTIN_VERSION.libevent= 0.5 100BUILTIN_VERSION.libevent= 0.5
101. endif 101. endif
102. endif 102. endif
103BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent} 103BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent}
104.endif 104.endif
105MAKEVARS+= BUILTIN_PKG.libevent 105MAKEVARS+= BUILTIN_PKG.libevent
106 106
107### 107###
108### Determine whether we should use the built-in implementation if it 108### Determine whether we should use the built-in implementation if it
109### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 109### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
110### 110###
111.if !defined(USE_BUILTIN.libevent) 111.if !defined(USE_BUILTIN.libevent)
112. if ${PREFER.libevent} == "pkgsrc" 112. if ${PREFER.libevent} == "pkgsrc"
113USE_BUILTIN.libevent= no 113USE_BUILTIN.libevent= no
114. else 114. else
115USE_BUILTIN.libevent= ${IS_BUILTIN.libevent} 115USE_BUILTIN.libevent= ${IS_BUILTIN.libevent}
116. if defined(BUILTIN_PKG.libevent) && \ 116. if defined(BUILTIN_PKG.libevent) && \
117 !empty(IS_BUILTIN.libevent:M[yY][eE][sS]) 117 !empty(IS_BUILTIN.libevent:M[yY][eE][sS])
118USE_BUILTIN.libevent= yes 118USE_BUILTIN.libevent= yes
119. for _dep_ in ${BUILDLINK_API_DEPENDS.libevent} 119. for _dep_ in ${BUILDLINK_API_DEPENDS.libevent}
120. if !empty(USE_BUILTIN.libevent:M[yY][eE][sS]) 120. if !empty(USE_BUILTIN.libevent:M[yY][eE][sS])
121USE_BUILTIN.libevent!= \ 121USE_BUILTIN.libevent!= \
122 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libevent:Q}; then \ 122 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libevent:Q}; then \
123 ${ECHO} yes; \ 123 ${ECHO} yes; \
124 else \ 124 else \
125 ${ECHO} no; \ 125 ${ECHO} no; \
126 fi 126 fi
127. endif 127. endif
128. endfor 128. endfor
129. endif 129. endif
130. endif # PREFER.libevent 130. endif # PREFER.libevent
131.endif 131.endif
132MAKEVARS+= USE_BUILTIN.libevent 132MAKEVARS+= USE_BUILTIN.libevent
133 133
134# Fake pkg-config for builtin libevent on NetBSD 134# Fake pkg-config for builtin libevent on NetBSD
135 135
136.if !empty(USE_BUILTIN.libevent:M[yY][eE][sS]) 136.if !empty(USE_BUILTIN.libevent:M[yY][eE][sS])
137. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) 137. if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
138do-configure-pre-hook: override-libevent-pkgconfig 138do-configure-pre-hook: override-libevent-pkgconfig
139 139
140BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig 140BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
141LIBEVENT_PKGCFGF= libevent.pc 141LIBEVENT_PKGCFGF= libevent.pc
142 142
143override-libevent-pkgconfig: override-message-libevent-pkgconfig 143override-libevent-pkgconfig: override-message-libevent-pkgconfig
144override-message-libevent-pkgconfig: 144override-message-libevent-pkgconfig:
145 @${STEP_MSG} "Magical transformations for libevent on NetBSD." 145 @${STEP_MSG} "Generating pkg-config file for builtin libevent package."
146 146
147override-libevent-pkgconfig: 147override-libevent-pkgconfig:
148 ${RUN} \ 148 ${RUN} \
149 ${MKDIR} ${BLKDIR_PKGCFG}; \ 149 ${MKDIR} ${BLKDIR_PKGCFG}; \
150 { \ 150 { \
151 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \ 151 ${ECHO} "prefix=${LIBEVENT_PREFIX}"; \
152 ${ECHO} "exec_prefix=\$${prefix}"; \ 152 ${ECHO} "exec_prefix=\$${prefix}"; \
153 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 153 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
154 ${ECHO} "includedir=\$${prefix}/include"; \ 154 ${ECHO} "includedir=\$${prefix}/include"; \
155 ${ECHO} ""; \ 155 ${ECHO} ""; \
156 ${ECHO} "Name: libevent"; \ 156 ${ECHO} "Name: libevent"; \
157 ${ECHO} "Description: libevent is an asynchronous notification event loop library"; \ 157 ${ECHO} "Description: libevent is an asynchronous notification event loop library"; \
158 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \ 158 ${ECHO} "Version: ${BUILTIN_VERSION.libevent}"; \
159 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent"; \ 159 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -levent"; \
160 ${ECHO} "Cflags: -I\$${includedir}"; \ 160 ${ECHO} "Cflags: -I\$${includedir}"; \
161 } >> ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF}; 161 } >> ${BLKDIR_PKGCFG}/${LIBEVENT_PKGCFGF};
162. endif 162. endif
163.endif 163.endif
164 164

cvs diff -r1.3 -r1.4 pkgsrc/devel/libusb/builtin.mk (switch to unified diff)

--- pkgsrc/devel/libusb/builtin.mk 2011/10/04 14:19:47 1.3
+++ pkgsrc/devel/libusb/builtin.mk 2015/02/04 23:44:34 1.4
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: builtin.mk,v 1.3 2011/10/04 14:19:47 hans Exp $ 1# $NetBSD: builtin.mk,v 1.4 2015/02/04 23:44:34 tnn Exp $
2 2
3BUILTIN_PKG:= libusb 3BUILTIN_PKG:= libusb
4PKGCONFIG_BASE.libusb= /usr 4PKGCONFIG_BASE.libusb= /usr
5PKGCONFIG_FILE.libusb= /usr/bin/libusb-config /usr/sfw/bin/libusb-config 5PKGCONFIG_FILE.libusb= /usr/bin/libusb-config /usr/sfw/bin/libusb-config
6BUILTIN_VERSION_SCRIPT.libusb= ${FIND_FILES_libusb} --version \# 6BUILTIN_VERSION_SCRIPT.libusb= ${FIND_FILES_libusb} --version \#
7.include "../../mk/buildlink3/pkgconfig-builtin.mk" 7.include "../../mk/buildlink3/pkgconfig-builtin.mk"
8 8
9.if !empty(USE_BUILTIN.libusb:M[yY][eE][sS]) 9.if !empty(USE_BUILTIN.libusb:M[yY][eE][sS])
10LIBUSB_PREFIX= ${FIND_FILES_libusb:S/\/bin\/libusb-config//} 10LIBUSB_PREFIX= ${FIND_FILES_libusb:S/\/bin\/libusb-config//}
11BUILDLINK_FILES.libusb= bin/libusb-config 11BUILDLINK_FILES.libusb= bin/libusb-config
12BUILDLINK_PASSTHRU_DIRS+= ${LIBUSB_PREFIX}/lib ${LIBUSB_PREFIX}/include 12BUILDLINK_PASSTHRU_DIRS+= ${LIBUSB_PREFIX}/lib ${LIBUSB_PREFIX}/include
13 13
14. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) 14. if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
15do-configure-pre-hook: override-libusb-pkgconfig 15do-configure-pre-hook: override-libusb-pkgconfig
16 16
17BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig 17BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
18LIBUSB_PKGCFGF= libusb.pc 18LIBUSB_PKGCFGF= libusb.pc
19 19
20override-libusb-pkgconfig: override-message-libusb-pkgconfig 20override-libusb-pkgconfig: override-message-libusb-pkgconfig
21override-message-libusb-pkgconfig: 21override-message-libusb-pkgconfig:
22 @${STEP_MSG} "Magical transformations for libusb on Solaris." 22 @${STEP_MSG} "Generating pkg-config file for builtin libusb package."
23 23
24override-libusb-pkgconfig: 24override-libusb-pkgconfig:
25 ${RUN} \ 25 ${RUN} \
26 ${MKDIR} ${BLKDIR_PKGCFG}; \ 26 ${MKDIR} ${BLKDIR_PKGCFG}; \
27 { \ 27 { \
28 ${ECHO} "prefix=${LIBUSB_PREFIX}"; \ 28 ${ECHO} "prefix=${LIBUSB_PREFIX}"; \
29 ${ECHO} "exec_prefix=\$${prefix}"; \ 29 ${ECHO} "exec_prefix=\$${prefix}"; \
30 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 30 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
31 ${ECHO} "includedir=\$${prefix}/include"; \ 31 ${ECHO} "includedir=\$${prefix}/include"; \
32 ${ECHO} ""; \ 32 ${ECHO} ""; \
33 ${ECHO} "Name: libusb"; \ 33 ${ECHO} "Name: libusb"; \
34 ${ECHO} "Description: library for USB access"; \ 34 ${ECHO} "Description: library for USB access"; \
35 ${ECHO} "Version: ${BUILTIN_VERSION.libusb}"; \ 35 ${ECHO} "Version: ${BUILTIN_VERSION.libusb}"; \
36 ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lusb"; \ 36 ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lusb"; \
37 ${ECHO} "Cflags: -I\$${includedir}"; \ 37 ${ECHO} "Cflags: -I\$${includedir}"; \
38 } >> ${BLKDIR_PKGCFG}/${LIBUSB_PKGCFGF}; 38 } >> ${BLKDIR_PKGCFG}/${LIBUSB_PKGCFGF};
39. endif 39. endif
40.endif 40.endif

cvs diff -r1.1 -r1.2 pkgsrc/devel/libusb1/builtin.mk (switch to unified diff)

--- pkgsrc/devel/libusb1/builtin.mk 2014/06/01 06:13:53 1.1
+++ pkgsrc/devel/libusb1/builtin.mk 2015/02/04 23:44:34 1.2
@@ -1,49 +1,49 @@ @@ -1,49 +1,49 @@
1# $NetBSD: builtin.mk,v 1.1 2014/06/01 06:13:53 ryoon Exp $ 1# $NetBSD: builtin.mk,v 1.2 2015/02/04 23:44:34 tnn Exp $
2 2
3BUILTIN_PKG:= libusb1 3BUILTIN_PKG:= libusb1
4 4
5BUILTIN_FIND_HEADERS_VAR:= H_LIBUSB 5BUILTIN_FIND_HEADERS_VAR:= H_LIBUSB
6BUILTIN_FIND_HEADERS.H_LIBUSB= libusb.h 6BUILTIN_FIND_HEADERS.H_LIBUSB= libusb.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10.if !defined(IS_BUILTIN.libusb1) 10.if !defined(IS_BUILTIN.libusb1)
11IS_BUILTIN.libusb1= no 11IS_BUILTIN.libusb1= no
12. if empty(H_LIBUSB:M__nonexistent__) 12. if empty(H_LIBUSB:M__nonexistent__)
13IS_BUILTIN.libusb1= yes 13IS_BUILTIN.libusb1= yes
14. endif 14. endif
15.endif 15.endif
16MAKEVARS+= IS_BUILTIN.libusb1 16MAKEVARS+= IS_BUILTIN.libusb1
17 17
18.if !defined(USE_BUILTIN.libusb1) 18.if !defined(USE_BUILTIN.libusb1)
19USE_BUILTIN.libusb1= ${IS_BUILTIN.libusb1} 19USE_BUILTIN.libusb1= ${IS_BUILTIN.libusb1}
20.endif 20.endif
21 21
22.if !empty(USE_BUILTIN.libusb1:M[yY][eE][sS]) 22.if !empty(USE_BUILTIN.libusb1:M[yY][eE][sS])
23. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) 23. if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
24do-configure-pre-hook: override-libusb-pkgconfig 24do-configure-pre-hook: override-libusb-pkgconfig
25 25
26BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig 26BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
27LIBUSB_PKGCFGF= libusb-1.0.pc 27LIBUSB_PKGCFGF= libusb-1.0.pc
28 28
29override-libusb-pkgconfig: override-message-libusb-pkgconfig 29override-libusb-pkgconfig: override-message-libusb-pkgconfig
30override-message-libusb-pkgconfig: 30override-message-libusb-pkgconfig:
31 @${STEP_MSG} "Magical transformations for libusb on FreeBSD." 31 @${STEP_MSG} "Generating pkg-config file for builtin libusb1 package."
32 32
33override-libusb-pkgconfig: 33override-libusb-pkgconfig:
34 ${RUN} \ 34 ${RUN} \
35 ${MKDIR} ${BLKDIR_PKGCFG}; \ 35 ${MKDIR} ${BLKDIR_PKGCFG}; \
36 { \ 36 { \
37 ${ECHO} "prefix=${LIBUSB_PREFIX}"; \ 37 ${ECHO} "prefix=${LIBUSB_PREFIX}"; \
38 ${ECHO} "exec_prefix=\$${prefix}"; \ 38 ${ECHO} "exec_prefix=\$${prefix}"; \
39 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 39 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
40 ${ECHO} "includedir=\$${prefix}/include"; \ 40 ${ECHO} "includedir=\$${prefix}/include"; \
41 ${ECHO} ""; \ 41 ${ECHO} ""; \
42 ${ECHO} "Name: libusb-1.0"; \ 42 ${ECHO} "Name: libusb-1.0"; \
43 ${ECHO} "Description: library for USB access"; \ 43 ${ECHO} "Description: library for USB access"; \
44 ${ECHO} "Version: ${BUILTIN_VERSION.libusb1}"; \ 44 ${ECHO} "Version: ${BUILTIN_VERSION.libusb1}"; \
45 ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lusb"; \ 45 ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lusb"; \
46 ${ECHO} "Cflags: -I\$${includedir}"; \ 46 ${ECHO} "Cflags: -I\$${includedir}"; \
47 } >> ${BLKDIR_PKGCFG}/${LIBUSB_PKGCFGF}; 47 } >> ${BLKDIR_PKGCFG}/${LIBUSB_PKGCFGF};
48. endif 48. endif
49.endif 49.endif

cvs diff -r1.17 -r1.18 pkgsrc/mk/fuse.buildlink3.mk (switch to unified diff)

--- pkgsrc/mk/fuse.buildlink3.mk 2014/04/30 15:06:25 1.17
+++ pkgsrc/mk/fuse.buildlink3.mk 2015/02/04 23:44:34 1.18
@@ -1,103 +1,103 @@ @@ -1,103 +1,103 @@
1# $NetBSD: fuse.buildlink3.mk,v 1.17 2014/04/30 15:06:25 gdt Exp $ 1# $NetBSD: fuse.buildlink3.mk,v 1.18 2015/02/04 23:44:34 tnn Exp $
2# 2#
3# Makefile fragment for packages using the FUSE framework. 3# Makefile fragment for packages using the FUSE framework.
4# 4#
5 5
6# The symbol FUSE_BUILDLINK3_MK is used by filesystems/fuse's bl3.mk, 6# The symbol FUSE_BUILDLINK3_MK is used by filesystems/fuse's bl3.mk,
7# so use something else for our include guard. 7# so use something else for our include guard.
8.if !defined(MK_FUSE_BUILDLINK3_MK) 8.if !defined(MK_FUSE_BUILDLINK3_MK)
9MK_FUSE_BUILDLINK3_MK= # defined 9MK_FUSE_BUILDLINK3_MK= # defined
10 10
11.include "bsd.fast.prefs.mk" 11.include "bsd.fast.prefs.mk"
12 12
13. if ${OPSYS} == "Darwin" 13. if ${OPSYS} == "Darwin"
14 14
15# On Darwin, we only attempt to support "Fuse for OS X", known as 15# On Darwin, we only attempt to support "Fuse for OS X", known as
16# "OSXFUSE". MacFuse is dead, and fuse4x is merging into OSXFUSE. 16# "OSXFUSE". MacFuse is dead, and fuse4x is merging into OSXFUSE.
17 17
18. if !exists(/usr/local/lib/pkgconfig/osxfuse.pc) 18. if !exists(/usr/local/lib/pkgconfig/osxfuse.pc)
19PKG_FAIL_REASON+= \ 19PKG_FAIL_REASON+= \
20 "Couldn't find fuse; please install OSXFUSE." 20 "Couldn't find fuse; please install OSXFUSE."
21. endif 21. endif
22 22
23do-configure-pre-hook: override-fuse-pkgconfig 23do-configure-pre-hook: override-fuse-pkgconfig
24 24
25override-fuse-pkgconfig: override-message-fuse-pkgconfig 25override-fuse-pkgconfig: override-message-fuse-pkgconfig
26override-message-fuse-pkgconfig: 26override-message-fuse-pkgconfig:
27 @${STEP_MSG} "Setting up usage of native fuse." 27 @${STEP_MSG} "Setting up usage of native fuse."
28 28
29override-fuse-pkgconfig: 29override-fuse-pkgconfig:
30 ${RUN} \ 30 ${RUN} \
31 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ 31 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
32 ${LN} -s /usr/local/lib/pkgconfig/osxfuse.pc \ 32 ${LN} -s /usr/local/lib/pkgconfig/osxfuse.pc \
33 ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc 33 ${BUILDLINK_DIR}/lib/pkgconfig/fuse.pc
34 34
35BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/osxfuse 35BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/osxfuse
36# Too much! But allows -losxfuse to work. 36# Too much! But allows -losxfuse to work.
37BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib 37BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib
38 38
39. elif ${OPSYS} == "Linux" 39. elif ${OPSYS} == "Linux"
40 40
41. include "../../filesystems/fuse/buildlink3.mk" 41. include "../../filesystems/fuse/buildlink3.mk"
42 42
43. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*) 43. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
44 44
45. if !exists(/usr/include/fuse/fuse.h) 45. if !exists(/usr/include/fuse/fuse.h)
46PKG_FAIL_REASON+= "Couldn't find fuse headers, please install libfuse." 46PKG_FAIL_REASON+= "Couldn't find fuse headers, please install libfuse."
47. endif 47. endif
48. include "../../filesystems/fuse/buildlink3.mk" 48. include "../../filesystems/fuse/buildlink3.mk"
49 49
50. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "Minix" || \ 50. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "Minix" || \
51 !empty(MACHINE_PLATFORM:MDragonFly-[3-9]*-*) 51 !empty(MACHINE_PLATFORM:MDragonFly-[3-9]*-*)
52. if !exists(/usr/include/fuse.h) 52. if !exists(/usr/include/fuse.h)
53PKG_FAIL_REASON+= "Couldn't find fuse headers, please install librefuse." 53PKG_FAIL_REASON+= "Couldn't find fuse headers, please install librefuse."
54. endif 54. endif
55 55
56LDFLAGS.DragonFly+= -lpuffs 56LDFLAGS.DragonFly+= -lpuffs
57 57
58. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) 58. if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
59do-configure-pre-hook: override-fuse-pkgconfig 59do-configure-pre-hook: override-fuse-pkgconfig
60 60
61BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig 61BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
62FUSE_PKGCFGF= fuse.pc 62FUSE_PKGCFGF= fuse.pc
63 63
64override-fuse-pkgconfig: override-message-fuse-pkgconfig 64override-fuse-pkgconfig: override-message-fuse-pkgconfig
65override-message-fuse-pkgconfig: 65override-message-fuse-pkgconfig:
66 @${STEP_MSG} "Magical transformations for fuse on NetBSD." 66 @${STEP_MSG} "Generating pkg-config file for builtin fuse package."
67 67
68override-fuse-pkgconfig: 68override-fuse-pkgconfig:
69 ${RUN} \ 69 ${RUN} \
70 ${MKDIR} ${BLKDIR_PKGCFG}; \ 70 ${MKDIR} ${BLKDIR_PKGCFG}; \
71 { \ 71 { \
72 ${ECHO} "prefix=/usr"; \ 72 ${ECHO} "prefix=/usr"; \
73 ${ECHO} "exec_prefix=\$${prefix}"; \ 73 ${ECHO} "exec_prefix=\$${prefix}"; \
74 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 74 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
75 ${ECHO} "includedir=\$${prefix}/include"; \ 75 ${ECHO} "includedir=\$${prefix}/include"; \
76 ${ECHO} ""; \ 76 ${ECHO} ""; \
77 ${ECHO} "Name: FuSE"; \ 77 ${ECHO} "Name: FuSE"; \
78 ${ECHO} "Description: Filesystem USEr Space"; \ 78 ${ECHO} "Description: Filesystem USEr Space"; \
79 ${ECHO} "Version: 2.6.0"; \ 79 ${ECHO} "Version: 2.6.0"; \
80 ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lrefuse"; \ 80 ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lrefuse"; \
81 ${ECHO} "Cflags: -I\$${includedir}"; \ 81 ${ECHO} "Cflags: -I\$${includedir}"; \
82 } >> ${BLKDIR_PKGCFG}/${FUSE_PKGCFGF}; 82 } >> ${BLKDIR_PKGCFG}/${FUSE_PKGCFGF};
83 83
84. endif # pkg-config 84. endif # pkg-config
85 85
86# To make sure 86# To make sure
87BUILDLINK_TRANSFORM+= l:fuse:refuse 87BUILDLINK_TRANSFORM+= l:fuse:refuse
88 88
89# Undefined reference to fuse_main()... use fuse_exit() for now. 89# Undefined reference to fuse_main()... use fuse_exit() for now.
90. if defined(GNU_CONFIGURE) 90. if defined(GNU_CONFIGURE)
91SUBST_CLASSES+= refuse 91SUBST_CLASSES+= refuse
92SUBST_STAGE.refuse= pre-configure 92SUBST_STAGE.refuse= pre-configure
93SUBST_FILES.refuse= configure configure.ac configure.in 93SUBST_FILES.refuse= configure configure.ac configure.in
94SUBST_SED.refuse= -e "s|fuse_main|fuse_exit|g" 94SUBST_SED.refuse= -e "s|fuse_main|fuse_exit|g"
95. endif 95. endif
96 96
97. else # !NetBSD 97. else # !NetBSD
98 98
99PKG_FAIL_REASON+= "Your OS is not supported by the FUSE pkgsrc framework." 99PKG_FAIL_REASON+= "Your OS is not supported by the FUSE pkgsrc framework."
100 100
101. endif # end of Operating Systems 101. endif # end of Operating Systems
102 102
103.endif # MK_FUSE_BUILDLINK3_MK 103.endif # MK_FUSE_BUILDLINK3_MK

cvs diff -r1.18 -r1.19 pkgsrc/textproc/expat/builtin.mk (switch to unified diff)

--- pkgsrc/textproc/expat/builtin.mk 2015/01/07 14:26:47 1.18
+++ pkgsrc/textproc/expat/builtin.mk 2015/02/04 23:44:34 1.19
@@ -1,117 +1,117 @@ @@ -1,117 +1,117 @@
1# $NetBSD: builtin.mk,v 1.18 2015/01/07 14:26:47 ryoon Exp $ 1# $NetBSD: builtin.mk,v 1.19 2015/02/04 23:44:34 tnn Exp $
2 2
3BUILTIN_PKG:= expat 3BUILTIN_PKG:= expat
4 4
5BUILTIN_FIND_HEADERS_VAR:= H_EXPAT 5BUILTIN_FIND_HEADERS_VAR:= H_EXPAT
6BUILTIN_FIND_HEADERS.H_EXPAT= expat.h 6BUILTIN_FIND_HEADERS.H_EXPAT= expat.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if !defined(IS_BUILTIN.expat) 14.if !defined(IS_BUILTIN.expat)
15. if empty(H_EXPAT:M__nonexistent__) 15. if empty(H_EXPAT:M__nonexistent__)
16IS_BUILTIN.expat= yes 16IS_BUILTIN.expat= yes
17. else 17. else
18IS_BUILTIN.expat= no 18IS_BUILTIN.expat= no
19. endif 19. endif
20.endif 20.endif
21MAKEVARS+= IS_BUILTIN.expat 21MAKEVARS+= IS_BUILTIN.expat
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.expat) && \ 27.if !defined(BUILTIN_PKG.expat) && \
28 !empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \ 28 !empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \
29 empty(H_EXPAT:M__nonexistent__) 29 empty(H_EXPAT:M__nonexistent__)
30BUILTIN_VERSION.expat!= \ 30BUILTIN_VERSION.expat!= \
31 ${AWK} '/\#define[ ]*XML_MAJOR_VERSION/ { M = $$3 } \ 31 ${AWK} '/\#define[ ]*XML_MAJOR_VERSION/ { M = $$3 } \
32 /\#define[ ]*XML_MINOR_VERSION/ { m = "."$$3 } \ 32 /\#define[ ]*XML_MINOR_VERSION/ { m = "."$$3 } \
33 /\#define[ ]*XML_MICRO_VERSION/ { u = "."$$3 } \ 33 /\#define[ ]*XML_MICRO_VERSION/ { u = "."$$3 } \
34 END { printf "%s%s%s\n", M, m, u }' \ 34 END { printf "%s%s%s\n", M, m, u }' \
35 ${H_EXPAT} 35 ${H_EXPAT}
36BUILTIN_PKG.expat= expat-${BUILTIN_VERSION.expat} 36BUILTIN_PKG.expat= expat-${BUILTIN_VERSION.expat}
37.endif 37.endif
38MAKEVARS+= BUILTIN_PKG.expat 38MAKEVARS+= BUILTIN_PKG.expat
39 39
40### 40###
41### Determine whether we should use the built-in implementation if it 41### Determine whether we should use the built-in implementation if it
42### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 42### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
43### 43###
44.if !defined(USE_BUILTIN.expat) 44.if !defined(USE_BUILTIN.expat)
45. if ${PREFER.expat} == "pkgsrc" 45. if ${PREFER.expat} == "pkgsrc"
46USE_BUILTIN.expat= no 46USE_BUILTIN.expat= no
47. else 47. else
48USE_BUILTIN.expat= ${IS_BUILTIN.expat} 48USE_BUILTIN.expat= ${IS_BUILTIN.expat}
49. if defined(BUILTIN_PKG.expat) && \ 49. if defined(BUILTIN_PKG.expat) && \
50 !empty(IS_BUILTIN.expat:M[yY][eE][sS]) 50 !empty(IS_BUILTIN.expat:M[yY][eE][sS])
51USE_BUILTIN.expat= yes 51USE_BUILTIN.expat= yes
52. for _dep_ in ${BUILDLINK_API_DEPENDS.expat} 52. for _dep_ in ${BUILDLINK_API_DEPENDS.expat}
53. if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) 53. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
54USE_BUILTIN.expat!= \ 54USE_BUILTIN.expat!= \
55 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then \ 55 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then \
56 ${ECHO} yes; \ 56 ${ECHO} yes; \
57 else \ 57 else \
58 ${ECHO} no; \ 58 ${ECHO} no; \
59 fi 59 fi
60. endif 60. endif
61. endfor 61. endfor
62. endif 62. endif
63. endif # PREFER.expat 63. endif # PREFER.expat
64.endif 64.endif
65MAKEVARS+= USE_BUILTIN.expat 65MAKEVARS+= USE_BUILTIN.expat
66 66
67### 67###
68### The section below only applies if we are not including this file 68### The section below only applies if we are not including this file
69### solely to determine whether a built-in implementation exists. 69### solely to determine whether a built-in implementation exists.
70### 70###
71CHECK_BUILTIN.expat?= no 71CHECK_BUILTIN.expat?= no
72.if !empty(CHECK_BUILTIN.expat:M[nN][oO]) 72.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
73 73
74. if !empty(USE_BUILTIN.expat:M[nN][oO]) 74. if !empty(USE_BUILTIN.expat:M[nN][oO])
75BUILDLINK_API_DEPENDS.expat+= expat>=1.95.4 75BUILDLINK_API_DEPENDS.expat+= expat>=1.95.4
76. else 76. else
77. if !empty(H_EXPAT:M${X11BASE}/*) 77. if !empty(H_EXPAT:M${X11BASE}/*)
78. include "../../mk/x11.builtin.mk" 78. include "../../mk/x11.builtin.mk"
79. elif !empty(H_EXPAT:M/usr/*) 79. elif !empty(H_EXPAT:M/usr/*)
80BUILDLINK_PREFIX.expat= /usr 80BUILDLINK_PREFIX.expat= /usr
81. elif !empty(H_EXPAT:M/boot/common/*) 81. elif !empty(H_EXPAT:M/boot/common/*)
82BUILDLINK_PREFIX.expat= /boot/common 82BUILDLINK_PREFIX.expat= /boot/common
83. endif 83. endif
84. endif 84. endif
85 85
86.endif # CHECK_BUILTIN.expat 86.endif # CHECK_BUILTIN.expat
87 87
88# Fake pkg-config for builtin expat on NetBSD 88# Fake pkg-config for builtin expat on NetBSD
89 89
90.if !empty(USE_BUILTIN.expat:M[yY][eE][sS]) 90.if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
91. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) 91. if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
92do-configure-pre-hook: override-expat-pkgconfig 92do-configure-pre-hook: override-expat-pkgconfig
93 93
94BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig 94BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
95EXPAT_PKGCFGF= expat.pc 95EXPAT_PKGCFGF= expat.pc
96 96
97override-expat-pkgconfig: override-message-expat-pkgconfig 97override-expat-pkgconfig: override-message-expat-pkgconfig
98override-message-expat-pkgconfig: 98override-message-expat-pkgconfig:
99 @${STEP_MSG} "Magical transformations for expat on NetBSD." 99 @${STEP_MSG} "Generating pkg-config file for builtin expat package."
100 100
101override-expat-pkgconfig: 101override-expat-pkgconfig:
102 ${RUN} \ 102 ${RUN} \
103 ${MKDIR} ${BLKDIR_PKGCFG}; \ 103 ${MKDIR} ${BLKDIR_PKGCFG}; \
104 { \ 104 { \
105 ${ECHO} "prefix=${BUILDLINK_PREFIX.expat}"; \ 105 ${ECHO} "prefix=${BUILDLINK_PREFIX.expat}"; \
106 ${ECHO} "exec_prefix=\$${prefix}"; \ 106 ${ECHO} "exec_prefix=\$${prefix}"; \
107 ${ECHO} "libdir=\$${exec_prefix}/lib"; \ 107 ${ECHO} "libdir=\$${exec_prefix}/lib"; \
108 ${ECHO} "includedir=\$${prefix}/include"; \ 108 ${ECHO} "includedir=\$${prefix}/include"; \
109 ${ECHO} ""; \ 109 ${ECHO} ""; \
110 ${ECHO} "Name: expat"; \ 110 ${ECHO} "Name: expat"; \
111 ${ECHO} "Description: expat XML parser"; \ 111 ${ECHO} "Description: expat XML parser"; \
112 ${ECHO} "Version: ${BUILTIN_VERSION.expat}"; \ 112 ${ECHO} "Version: ${BUILTIN_VERSION.expat}"; \
113 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -lexpat"; \ 113 ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -lexpat"; \
114 ${ECHO} "Cflags: -I\$${includedir}"; \ 114 ${ECHO} "Cflags: -I\$${includedir}"; \
115 } >> ${BLKDIR_PKGCFG}/${EXPAT_PKGCFGF}; 115 } >> ${BLKDIR_PKGCFG}/${EXPAT_PKGCFGF};
116. endif 116. endif
117.endif 117.endif