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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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###
@@ -132,27 +132,27 @@ USE_BUILTIN.libevent!= \ @@ -132,27 +132,27 @@ USE_BUILTIN.libevent!= \
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}"; \

cvs diff -r1.3 -r1.4 pkgsrc/devel/libusb/builtin.mk (expand / 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,35 +1,35 @@ @@ -1,35 +1,35 @@
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}"; \

cvs diff -r1.1 -r1.2 pkgsrc/devel/libusb1/builtin.mk (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -18,27 +18,27 @@ MAKEVARS+= IS_BUILTIN.libusb1 @@ -18,27 +18,27 @@ MAKEVARS+= IS_BUILTIN.libusb1
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}"; \

cvs diff -r1.17 -r1.18 pkgsrc/mk/fuse.buildlink3.mk (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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
@@ -53,27 +53,27 @@ PKG_FAIL_REASON+= "Couldn't find fuse he @@ -53,27 +53,27 @@ PKG_FAIL_REASON+= "Couldn't find fuse he
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"; \

cvs diff -r1.18 -r1.19 pkgsrc/textproc/expat/builtin.mk (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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)
@@ -86,27 +86,27 @@ BUILDLINK_PREFIX.expat= /boot/common @@ -86,27 +86,27 @@ BUILDLINK_PREFIX.expat= /boot/common
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}"; \