Fri Sep 4 13:21:19 2009 UTC ()
Use unzip from base if it exists.


(joerg)
diff -r1.41 -r1.42 pkgsrc/mk/tools/tools.NetBSD.mk
cvs diff -r1.41 -r1.42 pkgsrc/mk/tools/tools.NetBSD.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.NetBSD.mk 2008/05/22 20:11:55 1.41
+++ pkgsrc/mk/tools/tools.NetBSD.mk 2009/09/04 13:21:19 1.42
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.NetBSD.mk,v 1.41 2008/05/22 20:11:55 joerg Exp $ 1# $NetBSD: tools.NetBSD.mk,v 1.42 2009/09/04 13:21:19 joerg Exp $
2# 2#
3# System-supplied tools for the NetBSD operating system. 3# System-supplied tools for the NetBSD operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6TOOLS_PLATFORM.awk?= /usr/bin/awk 6TOOLS_PLATFORM.awk?= /usr/bin/awk
7TOOLS_PLATFORM.basename?= /usr/bin/basename 7TOOLS_PLATFORM.basename?= /usr/bin/basename
8TOOLS_PLATFORM.byacc?= /usr/bin/yacc 8TOOLS_PLATFORM.byacc?= /usr/bin/yacc
9.if exists(/usr/bin/bzcat) 9.if exists(/usr/bin/bzcat)
10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
11.endif 11.endif
12TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 12TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
13TOOLS_PLATFORM.cat?= /bin/cat 13TOOLS_PLATFORM.cat?= /bin/cat
14TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 14TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
@@ -104,26 +104,29 @@ TOOLS_PLATFORM.tail?= /usr/bin/tail @@ -104,26 +104,29 @@ TOOLS_PLATFORM.tail?= /usr/bin/tail
104.if exists(/bin/tar) 104.if exists(/bin/tar)
105TOOLS_PLATFORM.tar?= /bin/tar 105TOOLS_PLATFORM.tar?= /bin/tar
106.elif exists(/usr/bin/tar) 106.elif exists(/usr/bin/tar)
107TOOLS_PLATFORM.tar?= /usr/bin/tar 107TOOLS_PLATFORM.tar?= /usr/bin/tar
108.endif 108.endif
109TOOLS_PLATFORM.tbl?= /usr/bin/tbl 109TOOLS_PLATFORM.tbl?= /usr/bin/tbl
110TOOLS_PLATFORM.tee?= /usr/bin/tee 110TOOLS_PLATFORM.tee?= /usr/bin/tee
111TOOLS_PLATFORM.test?= test # shell builtin 111TOOLS_PLATFORM.test?= test # shell builtin
112TOOLS_PLATFORM.touch?= /usr/bin/touch 112TOOLS_PLATFORM.touch?= /usr/bin/touch
113TOOLS_PLATFORM.tr?= /usr/bin/tr 113TOOLS_PLATFORM.tr?= /usr/bin/tr
114TOOLS_PLATFORM.true?= true # shell builtin 114TOOLS_PLATFORM.true?= true # shell builtin
115TOOLS_PLATFORM.tsort?= /usr/bin/tsort 115TOOLS_PLATFORM.tsort?= /usr/bin/tsort
116TOOLS_PLATFORM.wc?= /usr/bin/wc 116TOOLS_PLATFORM.wc?= /usr/bin/wc
 117.if exists(/usr/bin/unzip)
 118TOOLS_PLATFORM.unzip?= /usr/bin/unzip
 119.endif
117TOOLS_PLATFORM.xargs?= /usr/bin/xargs 120TOOLS_PLATFORM.xargs?= /usr/bin/xargs
118.if exists(/usr/bin/xgettext) 121.if exists(/usr/bin/xgettext)
119TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext 122TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
120.endif 123.endif
121TOOLS_PLATFORM.yacc?= /usr/bin/yacc 124TOOLS_PLATFORM.yacc?= /usr/bin/yacc
122 125
123.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 126.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
124. for _t_ in ar as ld nm objdump ranlib readelf strip 127. for _t_ in ar as ld nm objdump ranlib readelf strip
125TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \ 128TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
126 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_} 129 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_}
127TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_} 130TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
128. endfor 131. endfor
129 132