summaryrefslogtreecommitdiff
path: root/mk/scripts
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2006-06-06 11:10:31 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2006-06-06 11:10:31 +0000
commit21bdb7a7872cc59433c17671ea2314516266c44d (patch)
tree5c549fda96a8e28cf55b8052af5d15757fc766ba /mk/scripts
parent2f705aaadf4d2a119f26e62af67f1578bc225a9a (diff)
downloadpkgsrc-21bdb7a7872cc59433c17671ea2314516266c44d.tar.gz
When using find to search for the "All" directories containing binary
packages, use -follow. Hopefully this will pick up all of the binary packages again after the ftp.netbsd.org reorganization.
Diffstat (limited to 'mk/scripts')
-rwxr-xr-xmk/scripts/binpkg-cache17
1 files changed, 13 insertions, 4 deletions
diff --git a/mk/scripts/binpkg-cache b/mk/scripts/binpkg-cache
index 1115cfbc2c8..954799fb0a2 100755
--- a/mk/scripts/binpkg-cache
+++ b/mk/scripts/binpkg-cache
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: binpkg-cache,v 1.7 2006/01/05 22:19:42 dmcmahill Exp $
+# $NetBSD: binpkg-cache,v 1.8 2006/06/06 11:10:31 dmcmahill Exp $
#
# Script for generating a cache file with information about
# all binary packages contained in a directory.
@@ -54,7 +54,7 @@ SORT=${SORT:-sort}
STAT=${STAT:-stat}
cachefile=.pkgcache
-cacheversion=20050428
+cacheversion=20060203
prompt="----> "
tab=" "
@@ -210,7 +210,15 @@ process_binpkg_dir(){
if test "X${DEBUG}" = "Xyes" ; then
echo "${PKG_INFO} -q -B ${f}"
fi
- ${PKG_INFO} -q -B ${f} >> ${tmpd}/${cachefile}
+ # The output of pkg_info contains the dependency information first
+ # (from the -n) followed by all the build definitions (-B).
+ # To make the dependency information easier to parse later, we
+ # want to prefix it with DEPENDS+=. Right now the only way I see
+ # to figure out when the DEPENDS section ends in the pkg_info output
+ # is by looking for a blank line.
+ ${PKG_INFO} -q -Bn ${f} | \
+ ${AWK} '/^$/ {x=1; print; next;} x==0 {printf("DEPENDS+=");} {print}' \
+ >> ${tmpd}/${cachefile}
echo "pkgcache_end ${fn}" >> ${tmpd}/${cachefile}
done
mv -f ${tmpd}/${cachefile} ${d}/${cachefile}
@@ -305,6 +313,7 @@ do
# Version
-V|--version)
${AWK} '/^#[ \t]*\$NetBSD/ {gsub(/,v/,"",$3);printf("%s: Version %s, %s\n",$3,$4,$5); exit 0;}' $prog
+ echo "Generating version ${cacheversion} of the cache files."
exit 0
;;
@@ -339,7 +348,7 @@ fi
# put a trailing / after ${PACKAGES} in case ${PACKAGES} is
# a link.
-for d in `${FIND} ${PACKAGES}/ -type d -print` ; do
+for d in `${FIND} ${PACKAGES}/ -type d -follow -print` ; do
if test "X${DEBUG}" = "Xyes" ; then
echo "${prompt}Processing directory ${d}"
fi